Skip to content

Commit

Permalink
Auto merge of rust-lang#102365 - weihanglo:update-cargo, r=ehuss
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
bors committed Sep 27, 2022
2 parents 57ee5cf + 5095f54 commit 470e518
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 2 deletions.
24 changes: 23 additions & 1 deletion Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ dependencies = [

[[package]]
name = "cargo"
version = "0.66.0"
version = "0.67.0"
dependencies = [
"anyhow",
"atty",
Expand Down Expand Up @@ -330,8 +330,10 @@ dependencies = [
"pretty_env_logger",
"rustc-workspace-hack",
"rustfix",
"same-file",
"semver",
"serde",
"serde-value",
"serde_ignored",
"serde_json",
"shell-escape",
Expand Down Expand Up @@ -417,6 +419,7 @@ dependencies = [
"anyhow",
"cargo-test-macro",
"cargo-util",
"crates-io",
"filetime",
"flate2",
"git2",
Expand Down Expand Up @@ -2418,6 +2421,15 @@ dependencies = [
"vcpkg",
]

[[package]]
name = "ordered-float"
version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
dependencies = [
"num-traits",
]

[[package]]
name = "os_info"
version = "3.5.0"
Expand Down Expand Up @@ -4437,6 +4449,16 @@ dependencies = [
"serde_derive",
]

[[package]]
name = "serde-value"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
dependencies = [
"ordered-float",
"serde",
]

[[package]]
name = "serde_derive"
version = "1.0.143"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 126 files

0 comments on commit 470e518

Please sign in to comment.