Skip to content

Commit 25b8771

Browse files
committed
Auto merge of #11719 - Muscraft:order-toml-deps, r=weihanglo
chore: Make dependencies alphabetical order `[dependencies]` in some `Cargo.toml` were out of alphabetical order. This made it slightly more time-consuming to find if a dependency was in a `Cargo.toml`. This PR makes it so that they are in alphabetical order. Note: `rustc-workspace-hack` was left alone at the bottom as it is a special dependency.
2 parents 2555e1c + c3043d9 commit 25b8771

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

Diff for: Cargo.toml

+12-12
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ name = "cargo"
1616
path = "src/cargo/lib.rs"
1717

1818
[dependencies]
19+
anyhow = "1.0.47"
1920
base64 = "0.13.1"
2021
bytesize = "1.0"
2122
cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" }
2223
cargo-util = { path = "crates/cargo-util", version = "0.2.3" }
24+
clap = "4.1.3"
2325
crates-io = { path = "crates/crates-io", version = "0.35.1" }
2426
curl = { version = "0.4.44", features = ["http2"] }
2527
curl-sys = "0.4.59"
2628
env_logger = "0.10.0"
27-
pretty_env_logger = { version = "0.4", optional = true }
28-
anyhow = "1.0.47"
2929
filetime = "0.2.9"
3030
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
3131
git2 = "0.16.0"
@@ -36,46 +36,46 @@ hmac = "0.12.1"
3636
home = "0.5"
3737
http-auth = { version = "0.1.6", default-features = false }
3838
humantime = "2.0.0"
39-
indexmap = "1"
4039
ignore = "0.4.7"
40+
im-rc = "15.0.0"
41+
indexmap = "1"
4142
is-terminal = "0.4.0"
42-
lazy_static = "1.2.0"
43+
itertools = "0.10.0"
4344
jobserver = "0.1.24"
45+
lazy_static = "1.2.0"
4446
lazycell = "1.2.0"
4547
libc = "0.2"
46-
log = "0.4.6"
4748
# Temporarily pin libgit2-sys due to some issues with SSH not working on
4849
# Windows.
4950
libgit2-sys = "=0.14.1"
51+
log = "0.4.6"
5052
memchr = "2.1.3"
5153
opener = "0.5"
54+
openssl = { version = '0.10.11', optional = true }
5255
os_info = "3.5.0"
5356
pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
5457
pathdiff = "0.2"
5558
percent-encoding = "2.0"
59+
pretty_env_logger = { version = "0.4", optional = true }
5660
rustfix = "0.6.0"
5761
semver = { version = "1.0.3", features = ["serde"] }
5862
serde = { version = "1.0.123", features = ["derive"] }
63+
serde-value = "0.7.0"
5964
serde_ignored = "0.1.0"
6065
serde_json = { version = "1.0.30", features = ["raw_value"] }
61-
serde-value = "0.7.0"
6266
sha1 = "0.10.5"
6367
shell-escape = "0.1.4"
6468
strip-ansi-escapes = "0.1.0"
6569
tar = { version = "0.4.38", default-features = false }
6670
tempfile = "3.0"
6771
termcolor = "1.1"
6872
time = { version = "0.3", features = ["parsing", "formatting"]}
69-
toml_edit = "0.19.0"
7073
toml = "0.7.0"
74+
toml_edit = "0.19.0"
75+
unicode-width = "0.1.5"
7176
unicode-xid = "0.2.0"
7277
url = "2.2.2"
7378
walkdir = "2.2"
74-
clap = "4.1.3"
75-
unicode-width = "0.1.5"
76-
openssl = { version = '0.10.11', optional = true }
77-
im-rc = "15.0.0"
78-
itertools = "0.10.0"
7979

8080
# A noop dependency that changes in the Rust repository, it's a bit of a hack.
8181
# See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`

Diff for: crates/cargo-test-support/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ anyhow = "1.0.34"
1212
cargo-test-macro = { path = "../cargo-test-macro" }
1313
cargo-util = { path = "../cargo-util" }
1414
crates-io = { path = "../crates-io" }
15-
snapbox = { version = "0.4.0", features = ["diff", "path"] }
1615
filetime = "0.2"
1716
flate2 = { version = "1.0", default-features = false, features = ["zlib"] }
18-
pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
19-
time = { version = "0.3", features = ["parsing", "formatting"]}
2017
git2 = "0.16.0"
2118
glob = "0.3"
2219
itertools = "0.10.0"
2320
lazy_static = "1.0"
21+
pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
2422
serde = { version = "1.0.123", features = ["derive"] }
2523
serde_json = "1.0"
24+
snapbox = { version = "0.4.0", features = ["diff", "path"] }
2625
tar = { version = "0.4.38", default-features = false }
2726
termcolor = "1.1.2"
27+
time = { version = "0.3", features = ["parsing", "formatting"]}
2828
toml = "0.7.0"
2929
url = "2.2.2"
3030

Diff for: crates/crates-io/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ name = "crates_io"
1313
path = "lib.rs"
1414

1515
[dependencies]
16-
curl = "0.4"
1716
anyhow = "1.0.34"
17+
curl = "0.4"
1818
percent-encoding = "2.0"
1919
serde = { version = "1.0", features = ['derive'] }
2020
serde_json = "1.0"

Diff for: crates/resolver-tests/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2018"
66
[dependencies]
77
cargo = { path = "../.." }
88
cargo-util = { path = "../cargo-util" }
9-
proptest = "0.9.1"
9+
is-terminal = "0.4.0"
1010
lazy_static = "1.3.0"
11+
proptest = "0.9.1"
1112
varisat = "0.2.1"
12-
is-terminal = "0.4.0"

0 commit comments

Comments
 (0)