Skip to content

Commit

Permalink
Rollup merge of #83418 - ehuss:update-cargo, r=ehuss
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
Dylan-DPC authored Mar 23, 2021
2 parents 7a0bc62 + 1d4b447 commit 2ee9b37
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 15 deletions.
45 changes: 31 additions & 14 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -287,11 +287,10 @@ dependencies = [
"cargo-platform",
"cargo-test-macro",
"cargo-test-support",
"cargo-util",
"clap",
"core-foundation",
"crates-io",
"crossbeam-utils 0.8.0",
"crypto-hash",
"curl",
"curl-sys",
"env_logger 0.8.1",
Expand All @@ -313,7 +312,6 @@ dependencies = [
"libgit2-sys",
"log",
"memchr",
"miow 0.3.6",
"num_cpus",
"opener",
"openssl",
Expand All @@ -322,12 +320,10 @@ dependencies = [
"rand 0.8.3",
"rustc-workspace-hack",
"rustfix",
"same-file",
"semver 0.10.0",
"serde",
"serde_ignored",
"serde_json",
"shell-escape",
"strip-ansi-escapes",
"tar",
"tempfile",
Expand Down Expand Up @@ -396,8 +392,9 @@ version = "0.1.0"
name = "cargo-test-support"
version = "0.1.0"
dependencies = [
"cargo",
"anyhow",
"cargo-test-macro",
"cargo-util",
"filetime",
"flate2",
"git2",
Expand All @@ -410,6 +407,26 @@ dependencies = [
"url 2.1.1",
]

[[package]]
name = "cargo-util"
version = "0.1.0"
dependencies = [
"anyhow",
"core-foundation",
"crypto-hash",
"filetime",
"hex 0.4.2",
"jobserver",
"libc",
"log",
"miow 0.3.6",
"same-file",
"shell-escape",
"tempfile",
"walkdir",
"winapi 0.3.9",
]

[[package]]
name = "cargo_metadata"
version = "0.8.2"
Expand Down Expand Up @@ -2765,9 +2782,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"

[[package]]
name = "proc-macro2"
version = "1.0.19"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
dependencies = [
"unicode-xid",
]
Expand Down Expand Up @@ -4793,18 +4810,18 @@ dependencies = [

[[package]]
name = "serde"
version = "1.0.118"
version = "1.0.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
dependencies = [
"serde_derive",
]

[[package]]
name = "serde_derive"
version = "1.0.118"
version = "1.0.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
dependencies = [
"proc-macro2",
"quote",
Expand Down Expand Up @@ -5100,9 +5117,9 @@ dependencies = [

[[package]]
name = "syn"
version = "1.0.38"
version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4"
checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f"
dependencies = [
"proc-macro2",
"quote",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 125 files

0 comments on commit 2ee9b37

Please sign in to comment.