ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/Cargo.toml

103 lines
2.7 KiB
TOML
Raw Normal View History

cargo-features = []
2022-04-01 06:44:28 +00:00
[workspace]
resolver = "2"
members = ["cli", "lib", "lib/testutils", "lib/gen-protos"]
feat(cargo): improve --release binary size Summary: On x86_64-linux, these options reduce the total number of bytes in the `jj` binary by 40 percent, from 16MiB to 9.8MiB, while having relatively minimal impact on build time, going from 58s to 1m15s. While `strip=debuginfo` is already the default, `codegen-units=1` is doing all the work here, and seems to have a rather miraculous effect despite not meaningfully hurting compile time too much for me at least. This actually will probably improve performance in some cases too, but it's likely hard to quantify. Ultimately, with or without this change, the dominant entity taking up most of the compile time for the whole project is `jj-lib` and `jj-cli` crates. A `--timings` report with Cargo indicates almost all dependencies (on my machine) compile within 30s whether or not this change is in play, so the remaining time is all on us. Various other changes, such as using `opt-level=z` or `lto=thin`, had no real visible effect. `lto=fat` was pretty successful, reducing total bytes by over 50% (7.8MiB), but at a nearly 2x link-time cost. It *might* be worth exploring if something like `lto=thin` could improve performance since it didn't meaningfully impact compile time or size any further, but that's TBD. Note: these numbers were performed with a wiped `target/` directory after each run, and so all dependencies were compiled from scratch, on my 12-core Ryzen 5600X. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Ioyoulrmtwxypsrwwwysyylvmqxzttkmn
2023-07-10 03:54:40 +00:00
[workspace.package]
version = "0.9.0"
license = "Apache-2.0"
rust-version = "1.71" # NOTE: remember to update CI, contributing.md, changelog.md, and flake.nix
edition = "2021"
readme = "README.md"
homepage = "https://github.com/martinvonz/jj"
repository = "https://github.com/martinvonz/jj"
documentation = "https://github.com/martinvonz/jj"
categories = ["version-control", "development-tools"]
keywords = ["VCS", "DVCS", "SCM", "Git", "Mercurial"]
[workspace.dependencies]
cargo: bump the cargo-dependencies group with 4 updates Bumps the cargo-dependencies group with 4 updates: [anyhow](https://github.com/dtolnay/anyhow), [clap](https://github.com/clap-rs/clap), [thiserror](https://github.com/dtolnay/thiserror) and [tokio](https://github.com/tokio-rs/tokio). Updates `anyhow` from 1.0.74 to 1.0.75 - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.74...1.0.75) Updates `clap` from 4.3.21 to 4.3.22 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.21...v4.3.22) Updates `thiserror` from 1.0.46 to 1.0.47 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.46...1.0.47) Updates `tokio` from 1.31.0 to 1.32.0 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.31.0...tokio-1.32.0) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
2023-08-17 15:25:01 +00:00
anyhow = "1.0.75"
assert_cmd = "2.0.8"
assert_matches = "1.5.0"
backoff = "0.4.0"
blake2 = "0.10.6"
byteorder = "1.4.3"
cargo: bump the cargo-dependencies group with 3 updates Bumps the cargo-dependencies group with 3 updates: [bytes](https://github.com/tokio-rs/bytes), [clap_complete](https://github.com/clap-rs/clap) and [chrono](https://github.com/chronotope/chrono). Updates `bytes` from 1.4.0 to 1.5.0 - [Release notes](https://github.com/tokio-rs/bytes/releases) - [Changelog](https://github.com/tokio-rs/bytes/blob/master/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/bytes/compare/v1.4.0...v1.5.0) Updates `clap_complete` from 4.4.0 to 4.4.1 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.4.0...clap_complete-v4.4.1) Updates `chrono` from 0.4.29 to 0.4.30 - [Release notes](https://github.com/chronotope/chrono/releases) - [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md) - [Commits](https://github.com/chronotope/chrono/compare/v0.4.29...v0.4.30) --- updated-dependencies: - dependency-name: bytes dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: chrono dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
2023-09-07 15:32:15 +00:00
bytes = "1.5.0"
cargo_metadata = "0.17.0"
clap = { version = "4.4.2", features = ["derive", "deprecated", "wrap_help"] }
cargo: bump the cargo-dependencies group with 3 updates Bumps the cargo-dependencies group with 3 updates: [bytes](https://github.com/tokio-rs/bytes), [clap_complete](https://github.com/clap-rs/clap) and [chrono](https://github.com/chronotope/chrono). Updates `bytes` from 1.4.0 to 1.5.0 - [Release notes](https://github.com/tokio-rs/bytes/releases) - [Changelog](https://github.com/tokio-rs/bytes/blob/master/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/bytes/compare/v1.4.0...v1.5.0) Updates `clap_complete` from 4.4.0 to 4.4.1 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.4.0...clap_complete-v4.4.1) Updates `chrono` from 0.4.29 to 0.4.30 - [Release notes](https://github.com/chronotope/chrono/releases) - [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md) - [Commits](https://github.com/chronotope/chrono/compare/v0.4.29...v0.4.30) --- updated-dependencies: - dependency-name: bytes dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: chrono dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
2023-09-07 15:32:15 +00:00
clap_complete = "4.4.1"
clap_mangen = "0.2.10"
cargo: bump the cargo-dependencies group with 3 updates Bumps the cargo-dependencies group with 3 updates: [bytes](https://github.com/tokio-rs/bytes), [clap_complete](https://github.com/clap-rs/clap) and [chrono](https://github.com/chronotope/chrono). Updates `bytes` from 1.4.0 to 1.5.0 - [Release notes](https://github.com/tokio-rs/bytes/releases) - [Changelog](https://github.com/tokio-rs/bytes/blob/master/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/bytes/compare/v1.4.0...v1.5.0) Updates `clap_complete` from 4.4.0 to 4.4.1 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.4.0...clap_complete-v4.4.1) Updates `chrono` from 0.4.29 to 0.4.30 - [Release notes](https://github.com/chronotope/chrono/releases) - [Changelog](https://github.com/chronotope/chrono/blob/main/CHANGELOG.md) - [Commits](https://github.com/chronotope/chrono/compare/v0.4.29...v0.4.30) --- updated-dependencies: - dependency-name: bytes dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: chrono dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
2023-09-07 15:32:15 +00:00
chrono = { version = "0.4.30", default-features = false, features = [
"std",
"clock",
] }
config = { version = "0.13.2", default-features = false, features = ["toml"] }
criterion = "0.5.1"
crossterm = { version = "0.26", default-features = false }
digest = "0.10.7"
dirs = "5.0.1"
either = "1.9.0"
esl01-renderdag = "0.3.0"
glob = "0.3.1"
git2 = "0.17.2"
hex = "0.4.3"
itertools = "0.11.0"
indexmap = "2.0.0"
libc = { version = "0.2.147" }
insta = { version = "1.31.0", features = ["filters"] }
maplit = "1.0.2"
num_cpus = "1.16.0"
once_cell = "1.18.0"
pest = "2.7.3"
pest_derive = "2.7.3"
pretty_assertions = "1.4.0"
prost = "0.11.9"
prost-build = "0.11.9"
rand = "0.8.5"
rand_chacha = "0.3.1"
rayon = "1.7.0"
regex = "1.9.5"
rpassword = "7.2.0"
rustix = { version = "0.38.13", features = ["fs"] }
smallvec = { version = "1.11.0", features = [
"const_generics",
"const_new",
"union",
] }
scm-record = "0.1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.106"
slab = "0.4.9"
strsim = "0.10.0"
tempfile = "3.8.0"
test-case = "3.1.0"
textwrap = "0.16.0"
thiserror = "1.0.48"
timeago = { version = "0.4.1", default-features = false }
toml_edit = { version = "0.19.15", features = ["serde"] }
tracing = "0.1.37"
tracing-chrome = "0.7.1"
tracing-subscriber = { version = "0.3.17", default-features = false, features = [
"std",
"ansi",
"env-filter",
"fmt",
] }
cargo: bump the cargo-dependencies group with 4 updates Bumps the cargo-dependencies group with 4 updates: [anyhow](https://github.com/dtolnay/anyhow), [clap](https://github.com/clap-rs/clap), [thiserror](https://github.com/dtolnay/thiserror) and [tokio](https://github.com/tokio-rs/tokio). Updates `anyhow` from 1.0.74 to 1.0.75 - [Release notes](https://github.com/dtolnay/anyhow/releases) - [Commits](https://github.com/dtolnay/anyhow/compare/1.0.74...1.0.75) Updates `clap` from 4.3.21 to 4.3.22 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/v4.3.21...v4.3.22) Updates `thiserror` from 1.0.46 to 1.0.47 - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.46...1.0.47) Updates `tokio` from 1.31.0 to 1.32.0 - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.31.0...tokio-1.32.0) --- updated-dependencies: - dependency-name: anyhow dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-patch dependency-group: cargo-dependencies - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor dependency-group: cargo-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
2023-08-17 15:25:01 +00:00
tokio = { version = "1.32.0" }
unicode-width = "0.1.10"
watchman_client = { version = "0.8.0" }
whoami = "1.4.1"
version_check = "0.9.4"
zstd = "0.12.4"
# put all inter-workspace libraries, i.e. those that use 'path = ...' here in
# their own (alphabetically sorted) block
jj-lib = { path = "lib", version = "0.9.0" }
testutils = { path = "lib/testutils" }
feat(cargo): improve --release binary size Summary: On x86_64-linux, these options reduce the total number of bytes in the `jj` binary by 40 percent, from 16MiB to 9.8MiB, while having relatively minimal impact on build time, going from 58s to 1m15s. While `strip=debuginfo` is already the default, `codegen-units=1` is doing all the work here, and seems to have a rather miraculous effect despite not meaningfully hurting compile time too much for me at least. This actually will probably improve performance in some cases too, but it's likely hard to quantify. Ultimately, with or without this change, the dominant entity taking up most of the compile time for the whole project is `jj-lib` and `jj-cli` crates. A `--timings` report with Cargo indicates almost all dependencies (on my machine) compile within 30s whether or not this change is in play, so the remaining time is all on us. Various other changes, such as using `opt-level=z` or `lto=thin`, had no real visible effect. `lto=fat` was pretty successful, reducing total bytes by over 50% (7.8MiB), but at a nearly 2x link-time cost. It *might* be worth exploring if something like `lto=thin` could improve performance since it didn't meaningfully impact compile time or size any further, but that's TBD. Note: these numbers were performed with a wiped `target/` directory after each run, and so all dependencies were compiled from scratch, on my 12-core Ryzen 5600X. Signed-off-by: Austin Seipp <aseipp@pobox.com> Change-Id: Ioyoulrmtwxypsrwwwysyylvmqxzttkmn
2023-07-10 03:54:40 +00:00
[profile.release]
strip = "debuginfo"
codegen-units = 1