Skip to content

Commit 282cf89

Browse files
authored
Rollup merge of rust-lang#83418 - ehuss:update-cargo, r=ehuss
Update cargo 8 commits in 90691f2bfe9a50291a98983b1ed2feab51d5ca55..58a961314437258065e23cb6316dfc121d96fb71 2021-03-16 21:36:55 +0000 to 2021-03-22 22:59:56 +0000 - Emit note when `--future-incompat-report` had nothing to report (rust-lang/cargo#9263) - RFC 3052: Stop including authors field in manifests made by cargo new (rust-lang/cargo#9282) - Refactor feature handling, and improve error messages. (rust-lang/cargo#9290) - Split out cargo-util package for cargo-test-support. (rust-lang/cargo#9292) - Fix redundant_semicolons warning in resolver-tests. (rust-lang/cargo#9293) - Use serde's error message option to avoid implementing `Deserialize`. (rust-lang/cargo#9237) - Allow `cargo update` to operate with the --offline flag (rust-lang/cargo#9279) - Fix typo in faq.md (rust-lang/cargo#9285)
2 parents e54a4c7 + 1d4b447 commit 282cf89

File tree

2 files changed

+32
-15
lines changed

2 files changed

+32
-15
lines changed

Cargo.lock

+31-14
Original file line numberDiff line numberDiff line change
@@ -287,11 +287,10 @@ dependencies = [
287287
"cargo-platform",
288288
"cargo-test-macro",
289289
"cargo-test-support",
290+
"cargo-util",
290291
"clap",
291-
"core-foundation",
292292
"crates-io",
293293
"crossbeam-utils 0.8.0",
294-
"crypto-hash",
295294
"curl",
296295
"curl-sys",
297296
"env_logger 0.8.1",
@@ -313,7 +312,6 @@ dependencies = [
313312
"libgit2-sys",
314313
"log",
315314
"memchr",
316-
"miow 0.3.6",
317315
"num_cpus",
318316
"opener",
319317
"openssl",
@@ -322,12 +320,10 @@ dependencies = [
322320
"rand 0.8.3",
323321
"rustc-workspace-hack",
324322
"rustfix",
325-
"same-file",
326323
"semver 0.10.0",
327324
"serde",
328325
"serde_ignored",
329326
"serde_json",
330-
"shell-escape",
331327
"strip-ansi-escapes",
332328
"tar",
333329
"tempfile",
@@ -396,8 +392,9 @@ version = "0.1.0"
396392
name = "cargo-test-support"
397393
version = "0.1.0"
398394
dependencies = [
399-
"cargo",
395+
"anyhow",
400396
"cargo-test-macro",
397+
"cargo-util",
401398
"filetime",
402399
"flate2",
403400
"git2",
@@ -410,6 +407,26 @@ dependencies = [
410407
"url 2.1.1",
411408
]
412409

410+
[[package]]
411+
name = "cargo-util"
412+
version = "0.1.0"
413+
dependencies = [
414+
"anyhow",
415+
"core-foundation",
416+
"crypto-hash",
417+
"filetime",
418+
"hex 0.4.2",
419+
"jobserver",
420+
"libc",
421+
"log",
422+
"miow 0.3.6",
423+
"same-file",
424+
"shell-escape",
425+
"tempfile",
426+
"walkdir",
427+
"winapi 0.3.9",
428+
]
429+
413430
[[package]]
414431
name = "cargo_metadata"
415432
version = "0.8.2"
@@ -2765,9 +2782,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
27652782

27662783
[[package]]
27672784
name = "proc-macro2"
2768-
version = "1.0.19"
2785+
version = "1.0.24"
27692786
source = "registry+https://github.com/rust-lang/crates.io-index"
2770-
checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
2787+
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
27712788
dependencies = [
27722789
"unicode-xid",
27732790
]
@@ -4793,18 +4810,18 @@ dependencies = [
47934810

47944811
[[package]]
47954812
name = "serde"
4796-
version = "1.0.118"
4813+
version = "1.0.125"
47974814
source = "registry+https://github.com/rust-lang/crates.io-index"
4798-
checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
4815+
checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
47994816
dependencies = [
48004817
"serde_derive",
48014818
]
48024819

48034820
[[package]]
48044821
name = "serde_derive"
4805-
version = "1.0.118"
4822+
version = "1.0.125"
48064823
source = "registry+https://github.com/rust-lang/crates.io-index"
4807-
checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
4824+
checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
48084825
dependencies = [
48094826
"proc-macro2",
48104827
"quote",
@@ -5100,9 +5117,9 @@ dependencies = [
51005117

51015118
[[package]]
51025119
name = "syn"
5103-
version = "1.0.38"
5120+
version = "1.0.64"
51045121
source = "registry+https://github.com/rust-lang/crates.io-index"
5105-
checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4"
5122+
checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f"
51065123
dependencies = [
51075124
"proc-macro2",
51085125
"quote",

src/tools/cargo

Submodule cargo updated 125 files

0 commit comments

Comments
 (0)