Skip to content

Commit 3a5c245

Browse files
authored
Rollup merge of #116603 - onur-ozkan:reorganize-cargo-file, r=Mark-Simulacrum
Reorganize `bootstrap/Cargo.toml` The information here https://github.com/rust-lang/rust/blob/5b88d659f8c2428536589d4bd36b9099d53a6815/src/bootstrap/Cargo.toml#L55-L59 was wrong. This PR fixes that and sorts the dependencies in ascending order. Additionally, I moved the 'features' section above up to make it appear easier.
2 parents a8cda30 + acaec5c commit 3a5c245

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/bootstrap/Cargo.toml

+12-12
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ edition = "2021"
55
build = "build.rs"
66
default-run = "bootstrap"
77

8+
[features]
9+
build-metrics = ["sysinfo"]
10+
811
[lib]
912
path = "lib.rs"
1013
doctest = false
@@ -31,12 +34,18 @@ test = false
3134

3235
[dependencies]
3336
build_helper = { path = "../tools/build_helper" }
37+
cc = "1.0.69"
38+
clap = { version = "4.2.4", default-features = false, features = ["std", "usage", "help", "derive", "error-context"] }
39+
clap_complete = "4.2.2"
3440
cmake = "0.1.38"
3541
filetime = "0.2"
36-
cc = "1.0.69"
37-
libc = "0.2"
3842
hex = "0.4"
43+
ignore = "0.4.10"
44+
libc = "0.2"
3945
object = { version = "0.32.0", default-features = false, features = ["archive", "coff", "read_core", "unaligned"] }
46+
once_cell = "1.7.2"
47+
opener = "0.5"
48+
semver = "1.0.17"
4049
serde = "1.0.137"
4150
# Directly use serde_derive rather than through the derive feature of serde to allow building both
4251
# in parallel and to allow serde_json and toml to start building as soon as serde has been built.
@@ -46,17 +55,11 @@ sha2 = "0.10"
4655
tar = "0.4"
4756
termcolor = "1.2.0"
4857
toml = "0.5"
49-
ignore = "0.4.10"
50-
opener = "0.5"
51-
once_cell = "1.7.2"
52-
xz2 = "0.1"
5358
walkdir = "2"
59+
xz2 = "0.1"
5460

5561
# Dependencies needed by the build-metrics feature
5662
sysinfo = { version = "0.26.0", optional = true }
57-
clap = { version = "4.2.4", default-features = false, features = ["std", "usage", "help", "derive", "error-context"] }
58-
clap_complete = "4.2.2"
59-
semver = "1.0.17"
6063

6164
# Solaris doesn't support flock() and thus fd-lock is not option now
6265
[target.'cfg(not(target_os = "solaris"))'.dependencies]
@@ -80,9 +83,6 @@ features = [
8083
[dev-dependencies]
8184
pretty_assertions = "1.4"
8285

83-
[features]
84-
build-metrics = ["sysinfo"]
85-
8686
# We care a lot about bootstrap's compile times, so don't include debuginfo for
8787
# dependencies, only bootstrap itself.
8888
[profile.dev]

0 commit comments

Comments
 (0)