Skip to content

Commit 5a15eda

Browse files
authored
merge unreleased crate back into app (#71)
* wip * wip * wip * wip * wip * wip * wip
1 parent 8add957 commit 5a15eda

62 files changed

Lines changed: 1006 additions & 3488 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.justfile

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ archive target asset:
1111

1212
build *ARGS:
1313
just banner "build {{ARGS}}..."
14-
cargo build --quiet -p tennis-cli {{ARGS}}
14+
cargo build --quiet {{ARGS}}
1515

1616
build-release: (build "--release")
1717
ls -lh target/release/tennis
@@ -31,7 +31,7 @@ gen:
3131
just banner "✓ gen ✓"
3232

3333
run *ARGS:
34-
cargo run -p tennis-cli -- {{ARGS}}
34+
cargo run -- {{ARGS}}
3535

3636
#
3737
# check/llm
@@ -69,35 +69,23 @@ lint:
6969
rustup --quiet component add --toolchain nightly rustfmt
7070
rustup --quiet component add clippy
7171
cargo +nightly fmt --all --check
72-
cargo clippy --quiet --workspace --all-targets --all-features -- -D warnings
72+
cargo clippy --quiet --all-targets --all-features -- -D warnings
7373

7474
test *ARGS:
7575
just banner "test {{ARGS}}..."
76-
cargo test --quiet --workspace --lib --bins {{ARGS}}
76+
cargo test --quiet --bin tennis {{ARGS}}
7777

7878
test-verbose *ARGS:
7979
TENNIS_VERBOSE=1 just test {{ARGS}} -- --nocapture
8080

81-
#
82-
# lib
83-
#
84-
85-
build-lib *ARGS:
86-
just banner "build-lib {{ARGS}}..."
87-
cargo build --quiet -p tennis {{ARGS}}
88-
89-
test-lib *ARGS:
90-
just banner "test-lib {{ARGS}}..."
91-
cargo test --quiet -p tennis --lib {{ARGS}}
92-
9381
#
9482
# dev
9583
#
9684

9785
coverage:
9886
rm -rf tmp/coverage && mkdir -p tmp/coverage
9987
mise x cargo:cargo-llvm-cov -- \
100-
cargo llvm-cov --all-targets --all-features --workspace --html --output-dir tmp/coverage
88+
cargo llvm-cov --all-targets --all-features --html --output-dir tmp/coverage
10189
just banner "✓ coverage -> tmp/coverage/html/index.html ✓"
10290

10391
callgrind *ARGS: (build "--release --config profile.release.debug=1")
@@ -106,10 +94,6 @@ callgrind *ARGS: (build "--release --config profile.release.debug=1")
10694
target/release/tennis --color=on --width 120 {{ARGS}} tmp/bench.csv > /dev/null
10795
callgrind_annotate --auto=no --threshold=75 tmp/callgrind.out
10896

109-
derive:
110-
just banner "derive..."
111-
cargo run --quiet -p tennis --example derive
112-
11397
instrument: build-release
11498
just banner "gen-bench..."
11599
gen-bench 1000000 # 1M is good for instrumentation, which runs once

AGENTS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## Important
66

7-
- The library crate is unreleased; backward compatibility is not required.
7+
- Backward compatibility for internal APIs is not required.
88
- Optimize for ordinary CLI data. Numeric extremes and exact rounding-boundary compatibility are out of scope unless requested.
99
- `--peek` is not performance-sensitive; prefer simple code over optimizing it.
1010
- Do not create commits unless explicitly requested.

Cargo.lock

Lines changed: 4 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,28 @@
1-
[workspace]
2-
members = ["cli", "tennis-derive"]
3-
resolver = "3"
4-
51
[package]
62
name = "tennis"
73
version = "0.7.1"
84
edition = "2024"
95
rust-version = "1.96"
106
license = "MIT"
11-
categories = ["command-line-utilities", "text-processing"]
127
description = "Stylish CSV tables in your terminal"
13-
exclude = ["assets/", "bin/", "cli/", "extra/", "tests/"]
14-
keywords = ["csv", "table", "terminal", "json", "sqlite", "cli"]
8+
publish = false
159
repository = "https://github.com/gurgeous/tennis"
1610

1711
[dependencies]
1812
anstyle = "1"
1913
anstream = "1"
14+
clap = { version = "4", features = ["derive"] }
15+
csv = "1"
16+
natord = "1"
2017
num-format = "0.4"
2118
rand = "0.8"
22-
serde_json = "1"
23-
tennis-derive = { path = "tennis-derive" }
19+
shell-words = "1"
20+
simd-json = { version = "0.17", default-features = false, features = ["runtime-detection", "swar-number-parsing"] }
2421
terminal-colorsaurus = { version = "1", features = ["anstyle"] }
2522
terminal_size = "0.4"
2623
unicode-truncate = "2"
2724
unicode-width = "0.2"
2825

29-
#
30-
# tests
31-
#
32-
33-
[dev-dependencies]
34-
csv = "1"
35-
serde = { version = "1", features = ["derive"] }
36-
3726
#
3827
# haven't decided which release is preferred yet
3928
#

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Download a binary from https://github.com/gurgeous/tennis/releases. Copy it some
2525
```sh
2626
# this will build target/debug/tennis
2727
$ mise trust && mise install
28-
$ cargo build -p tennis-cli # or use `just build`
28+
$ cargo build # or use `just build`
2929
```
3030

3131
### Important Features
@@ -139,6 +139,7 @@ We love CSV tools and use them all the time! Here are a few that we rely on:
139139
- improve zebra, blend with terminal bg #64 (@RVC2020)
140140
- store typed cells, honor locale #66 (@RVC2020)
141141
- support col args by index #66 (@RVC2020)
142+
- merged unreleased crate back into app
142143

143144
#### 0.7.1 (Jul '26)
144145

cli/build.rs renamed to build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
use std::process::Command;
44

55
fn main() {
6-
println!("cargo:rerun-if-changed=../.git/HEAD");
7-
println!("cargo:rerun-if-changed=../.git/refs");
6+
println!("cargo:rerun-if-changed=.git/HEAD");
7+
println!("cargo:rerun-if-changed=.git/refs");
88

99
let output = Command::new("git").args(["rev-parse", "--short=7", "HEAD"]).output();
1010
let sha = match output {

cli/Cargo.toml

Lines changed: 0 additions & 22 deletions
This file was deleted.

cli/src/util.rs

Lines changed: 0 additions & 119 deletions
This file was deleted.

0 commit comments

Comments
 (0)