Skip to content

Commit 470e518

Browse files
committed
Auto merge of #102365 - weihanglo:update-cargo, r=ehuss
Update cargo 22 commits in 73ba3f35e0205844418260722c11602113179c4a..f5fed93ba24607980647962c59863bbabb03ce14 2022-09-18 06:38:16 +0000 to 2022-09-27 12:03:57 +0000 - build-scripts.md: Use em dash consistently. (rust-lang/cargo#11150) - Indicate how Cargo locates the manifest (rust-lang/cargo#10770) - Reduce references to `[project]` within cargo (rust-lang/cargo#11135) - Iteratively construct target cfg (rust-lang/cargo#11114) - update comment about `CARGO_BIN_EXE_` (rust-lang/cargo#11146) - Call out that not all config values can be set via env vars (rust-lang/cargo#11139) - Bump to 0.67.0, update changelog (rust-lang/cargo#11137) - ci: update toolchain for building api doc (rust-lang/cargo#11134) - Http publish not noop (rust-lang/cargo#11111) - Improve errors for TOML fields that support workspace inheritance (rust-lang/cargo#11113) - switch to `std::task::ready!()` where possible (rust-lang/cargo#11130) - Report cmd aliasing failure with more contexts (rust-lang/cargo#11087) - minor: remove unused mut (rust-lang/cargo#11127) - fix(cli): Forward non-UTF8 arguments to external subcommands (rust-lang/cargo#11118) - This change adds an example to the authors attribute in the manifest. (rust-lang/cargo#10938) - Add support for relative git submodule paths (rust-lang/cargo#11106) - make unknown features on `cargo add` more discoverable (rust-lang/cargo#11098) - Unlink old final artifacts before compilation (rust-lang/cargo#11122) - refactor(cli): Prepare for clap v4 (rust-lang/cargo#11116) - fix(cli): Error trailing args rather than ignore (rust-lang/cargo#11119) - Add a minor clarification (rust-lang/cargo#11093) - doc(changelog): mention CVE fixes (rust-lang/cargo#11104)
2 parents 57ee5cf + 5095f54 commit 470e518

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

Cargo.lock

+23-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ dependencies = [
288288

289289
[[package]]
290290
name = "cargo"
291-
version = "0.66.0"
291+
version = "0.67.0"
292292
dependencies = [
293293
"anyhow",
294294
"atty",
@@ -330,8 +330,10 @@ dependencies = [
330330
"pretty_env_logger",
331331
"rustc-workspace-hack",
332332
"rustfix",
333+
"same-file",
333334
"semver",
334335
"serde",
336+
"serde-value",
335337
"serde_ignored",
336338
"serde_json",
337339
"shell-escape",
@@ -417,6 +419,7 @@ dependencies = [
417419
"anyhow",
418420
"cargo-test-macro",
419421
"cargo-util",
422+
"crates-io",
420423
"filetime",
421424
"flate2",
422425
"git2",
@@ -2418,6 +2421,15 @@ dependencies = [
24182421
"vcpkg",
24192422
]
24202423

2424+
[[package]]
2425+
name = "ordered-float"
2426+
version = "2.10.0"
2427+
source = "registry+https://github.com/rust-lang/crates.io-index"
2428+
checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
2429+
dependencies = [
2430+
"num-traits",
2431+
]
2432+
24212433
[[package]]
24222434
name = "os_info"
24232435
version = "3.5.0"
@@ -4437,6 +4449,16 @@ dependencies = [
44374449
"serde_derive",
44384450
]
44394451

4452+
[[package]]
4453+
name = "serde-value"
4454+
version = "0.7.0"
4455+
source = "registry+https://github.com/rust-lang/crates.io-index"
4456+
checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
4457+
dependencies = [
4458+
"ordered-float",
4459+
"serde",
4460+
]
4461+
44404462
[[package]]
44414463
name = "serde_derive"
44424464
version = "1.0.143"

src/tools/cargo

Submodule cargo updated 126 files

0 commit comments

Comments
 (0)