Skip to content

Commit

Permalink
Auto merge of rust-lang#107993 - weihanglo:update-cargo, r=weihanglo
Browse files Browse the repository at this point in the history
Update cargo

10 commits in 82c3bb79e3a19a5164e33819ef81bfc2c984bc56..39c13e67a5962466cc7253d41bc1099bbcb224c3 2023-02-04 22:52:16 +0000 to 2023-02-12 02:01:08 +0000

- chore: Update to toml v0.6, toml_edit v0.18 (rust-lang/cargo#11618)
- doc: more doc comments and intra-doc links (rust-lang/cargo#11703)
- Deny warnings in CI, not locally (rust-lang/cargo#11699)
- add comment to lto.rs (rust-lang/cargo#11701)
- Re-export cargo_new::NewProjectKind as public (rust-lang/cargo#11700)
- Add '-C' flag for changing current dir before build (rust-lang/cargo#10952)
- `-Zrustdoc-scrape-example` must fail with bad build script (rust-lang/cargo#11694)
- Update CHANGELOG for 1.68 backports (rust-lang/cargo#11690)
- Update 1password to the version 2 CLI (rust-lang/cargo#11692)
- chore: autolabel more for `A-*` (rust-lang/cargo#11679)

r? `@ghost`
  • Loading branch information
bors committed Feb 14, 2023
2 parents 5348a89 + 4c4b4c0 commit c3c6d73
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 35 deletions.
79 changes: 45 additions & 34 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ dependencies = [
"quote",
"serde",
"syn",
"toml",
"toml 0.5.7",
]

[[package]]
Expand Down Expand Up @@ -291,7 +291,7 @@ dependencies = [
"serde_json",
"sha2",
"tar",
"toml",
"toml 0.5.7",
]

[[package]]
Expand All @@ -307,7 +307,7 @@ dependencies = [
"indexmap",
"serde",
"serde_json",
"toml",
"toml 0.5.7",
]

[[package]]
Expand Down Expand Up @@ -408,6 +408,7 @@ dependencies = [
"tempfile",
"termcolor",
"time 0.3.17",
"toml 0.7.2",
"toml_edit",
"unicode-width",
"unicode-xid",
Expand Down Expand Up @@ -500,7 +501,7 @@ dependencies = [
"tar",
"termcolor",
"time 0.3.17",
"toml_edit",
"toml 0.7.2",
"url",
"windows-sys 0.45.0",
]
Expand Down Expand Up @@ -755,7 +756,7 @@ dependencies = [
"termize",
"tester",
"tokio",
"toml",
"toml 0.5.7",
"walkdir",
]

Expand Down Expand Up @@ -789,7 +790,7 @@ dependencies = [
"serde",
"serde_json",
"tempfile",
"toml",
"toml 0.5.7",
"unicode-normalization",
"unicode-script",
"url",
Expand Down Expand Up @@ -853,16 +854,6 @@ dependencies = [
"winapi",
]

[[package]]
name = "combine"
version = "4.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
dependencies = [
"bytes",
"memchr",
]

[[package]]
name = "commoncrypto"
version = "0.2.0"
Expand Down Expand Up @@ -2323,15 +2314,6 @@ dependencies = [
"serde_json",
]

[[package]]
name = "kstring"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747"
dependencies = [
"static_assertions",
]

[[package]]
name = "lazy_static"
version = "1.4.0"
Expand Down Expand Up @@ -2581,7 +2563,7 @@ dependencies = [
"serde_json",
"shlex",
"tempfile",
"toml",
"toml 0.5.7",
"topological-sort",
]

Expand Down Expand Up @@ -2727,6 +2709,15 @@ dependencies = [
"version_check",
]

[[package]]
name = "nom8"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
dependencies = [
"memchr",
]

[[package]]
name = "normalize-line-endings"
version = "0.3.0"
Expand Down Expand Up @@ -4962,7 +4953,7 @@ dependencies = [
"serde_json",
"term",
"thiserror",
"toml",
"toml 0.5.7",
"unicode-segmentation",
"unicode-width",
"unicode_categories",
Expand Down Expand Up @@ -5128,6 +5119,15 @@ dependencies = [
"serde",
]

[[package]]
name = "serde_spanned"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
dependencies = [
"serde",
]

[[package]]
name = "sha1"
version = "0.10.5"
Expand Down Expand Up @@ -5704,26 +5704,37 @@ dependencies = [
"serde",
]

[[package]]
name = "toml"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit",
]

[[package]]
name = "toml_datetime"
version = "0.5.0"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "808b51e57d0ef8f71115d8f3a01e7d3750d01c79cac4b3eda910f4389fdf92fd"
checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
dependencies = [
"serde",
]

[[package]]
name = "toml_edit"
version = "0.15.0"
version = "0.19.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1541ba70885967e662f69d31ab3aeca7b1aaecfcd58679590b893e9239c3646"
checksum = "5e6a7712b49e1775fb9a7b998de6635b299237f48b404dde71704f2e0e7f37e5"
dependencies = [
"combine",
"indexmap",
"itertools",
"kstring",
"nom8",
"serde",
"serde_spanned",
"toml_datetime",
]

Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 148 files

0 comments on commit c3c6d73

Please sign in to comment.