Skip to content

Commit c3c6d73

Browse files
committed
Auto merge of rust-lang#107993 - weihanglo:update-cargo, r=weihanglo
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`
2 parents 5348a89 + 4c4b4c0 commit c3c6d73

File tree

2 files changed

+46
-35
lines changed

2 files changed

+46
-35
lines changed

Cargo.lock

+45-34
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ dependencies = [
179179
"quote",
180180
"serde",
181181
"syn",
182-
"toml",
182+
"toml 0.5.7",
183183
]
184184

185185
[[package]]
@@ -291,7 +291,7 @@ dependencies = [
291291
"serde_json",
292292
"sha2",
293293
"tar",
294-
"toml",
294+
"toml 0.5.7",
295295
]
296296

297297
[[package]]
@@ -307,7 +307,7 @@ dependencies = [
307307
"indexmap",
308308
"serde",
309309
"serde_json",
310-
"toml",
310+
"toml 0.5.7",
311311
]
312312

313313
[[package]]
@@ -408,6 +408,7 @@ dependencies = [
408408
"tempfile",
409409
"termcolor",
410410
"time 0.3.17",
411+
"toml 0.7.2",
411412
"toml_edit",
412413
"unicode-width",
413414
"unicode-xid",
@@ -500,7 +501,7 @@ dependencies = [
500501
"tar",
501502
"termcolor",
502503
"time 0.3.17",
503-
"toml_edit",
504+
"toml 0.7.2",
504505
"url",
505506
"windows-sys 0.45.0",
506507
]
@@ -755,7 +756,7 @@ dependencies = [
755756
"termize",
756757
"tester",
757758
"tokio",
758-
"toml",
759+
"toml 0.5.7",
759760
"walkdir",
760761
]
761762

@@ -789,7 +790,7 @@ dependencies = [
789790
"serde",
790791
"serde_json",
791792
"tempfile",
792-
"toml",
793+
"toml 0.5.7",
793794
"unicode-normalization",
794795
"unicode-script",
795796
"url",
@@ -853,16 +854,6 @@ dependencies = [
853854
"winapi",
854855
]
855856

856-
[[package]]
857-
name = "combine"
858-
version = "4.6.6"
859-
source = "registry+https://github.com/rust-lang/crates.io-index"
860-
checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
861-
dependencies = [
862-
"bytes",
863-
"memchr",
864-
]
865-
866857
[[package]]
867858
name = "commoncrypto"
868859
version = "0.2.0"
@@ -2323,15 +2314,6 @@ dependencies = [
23232314
"serde_json",
23242315
]
23252316

2326-
[[package]]
2327-
name = "kstring"
2328-
version = "2.0.0"
2329-
source = "registry+https://github.com/rust-lang/crates.io-index"
2330-
checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747"
2331-
dependencies = [
2332-
"static_assertions",
2333-
]
2334-
23352317
[[package]]
23362318
name = "lazy_static"
23372319
version = "1.4.0"
@@ -2581,7 +2563,7 @@ dependencies = [
25812563
"serde_json",
25822564
"shlex",
25832565
"tempfile",
2584-
"toml",
2566+
"toml 0.5.7",
25852567
"topological-sort",
25862568
]
25872569

@@ -2727,6 +2709,15 @@ dependencies = [
27272709
"version_check",
27282710
]
27292711

2712+
[[package]]
2713+
name = "nom8"
2714+
version = "0.2.0"
2715+
source = "registry+https://github.com/rust-lang/crates.io-index"
2716+
checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
2717+
dependencies = [
2718+
"memchr",
2719+
]
2720+
27302721
[[package]]
27312722
name = "normalize-line-endings"
27322723
version = "0.3.0"
@@ -4962,7 +4953,7 @@ dependencies = [
49624953
"serde_json",
49634954
"term",
49644955
"thiserror",
4965-
"toml",
4956+
"toml 0.5.7",
49664957
"unicode-segmentation",
49674958
"unicode-width",
49684959
"unicode_categories",
@@ -5128,6 +5119,15 @@ dependencies = [
51285119
"serde",
51295120
]
51305121

5122+
[[package]]
5123+
name = "serde_spanned"
5124+
version = "0.6.1"
5125+
source = "registry+https://github.com/rust-lang/crates.io-index"
5126+
checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
5127+
dependencies = [
5128+
"serde",
5129+
]
5130+
51315131
[[package]]
51325132
name = "sha1"
51335133
version = "0.10.5"
@@ -5704,26 +5704,37 @@ dependencies = [
57045704
"serde",
57055705
]
57065706

5707+
[[package]]
5708+
name = "toml"
5709+
version = "0.7.2"
5710+
source = "registry+https://github.com/rust-lang/crates.io-index"
5711+
checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6"
5712+
dependencies = [
5713+
"serde",
5714+
"serde_spanned",
5715+
"toml_datetime",
5716+
"toml_edit",
5717+
]
5718+
57075719
[[package]]
57085720
name = "toml_datetime"
5709-
version = "0.5.0"
5721+
version = "0.6.1"
57105722
source = "registry+https://github.com/rust-lang/crates.io-index"
5711-
checksum = "808b51e57d0ef8f71115d8f3a01e7d3750d01c79cac4b3eda910f4389fdf92fd"
5723+
checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
57125724
dependencies = [
57135725
"serde",
57145726
]
57155727

57165728
[[package]]
57175729
name = "toml_edit"
5718-
version = "0.15.0"
5730+
version = "0.19.3"
57195731
source = "registry+https://github.com/rust-lang/crates.io-index"
5720-
checksum = "b1541ba70885967e662f69d31ab3aeca7b1aaecfcd58679590b893e9239c3646"
5732+
checksum = "5e6a7712b49e1775fb9a7b998de6635b299237f48b404dde71704f2e0e7f37e5"
57215733
dependencies = [
5722-
"combine",
57235734
"indexmap",
5724-
"itertools",
5725-
"kstring",
5735+
"nom8",
57265736
"serde",
5737+
"serde_spanned",
57275738
"toml_datetime",
57285739
]
57295740

src/tools/cargo

Submodule cargo updated 148 files

0 commit comments

Comments
 (0)