Skip to content

Commit d502eda

Browse files
committed
Auto merge of rust-lang#93314 - ehuss:update-cargo, r=ehuss
Update cargo 9 commits in 95bb3c92bf516017e812e7f1c14c2dea3845b30e..1c034752de0df744fcd7788fcbca158830b8bf85 2022-01-18 17:39:35 +0000 to 2022-01-25 22:36:53 +0000 - Sync toml_edit versions (rust-lang/cargo#10329) - Check --config for dotted keys only (rust-lang/cargo#10176) - Remove deprecated --host arg for search and publish cmds (rust-lang/cargo#10327) - doc: it's valid to use OUT_DIR for intermediate artifacts (rust-lang/cargo#10326) - Use local git info for version. (rust-lang/cargo#10323) - Fix documenting with undocumented dependencies. (rust-lang/cargo#10324) - do not compile test for bins flagged as `test = false` (rust-lang/cargo#10305) - Port cargo from toml-rs to toml_edit (rust-lang/cargo#10086) - Fix new::git_default_branch with different default (rust-lang/cargo#10306)
2 parents c54dfee + af8048b commit d502eda

File tree

2 files changed

+35
-3
lines changed

2 files changed

+35
-3
lines changed

Cargo.lock

+34-2
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ dependencies = [
379379
"tar",
380380
"tempfile",
381381
"termcolor",
382-
"toml",
382+
"toml_edit",
383383
"unicode-width",
384384
"unicode-xid",
385385
"url 2.2.2",
@@ -465,7 +465,7 @@ dependencies = [
465465
"serde_json",
466466
"tar",
467467
"termcolor",
468-
"toml",
468+
"toml_edit",
469469
"url 2.2.2",
470470
]
471471

@@ -731,6 +731,16 @@ dependencies = [
731731
"winapi",
732732
]
733733

734+
[[package]]
735+
name = "combine"
736+
version = "4.6.3"
737+
source = "registry+https://github.com/rust-lang/crates.io-index"
738+
checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062"
739+
dependencies = [
740+
"bytes",
741+
"memchr",
742+
]
743+
734744
[[package]]
735745
name = "commoncrypto"
736746
version = "0.2.0"
@@ -1953,6 +1963,15 @@ dependencies = [
19531963
"unicase",
19541964
]
19551965

1966+
[[package]]
1967+
name = "kstring"
1968+
version = "1.0.6"
1969+
source = "registry+https://github.com/rust-lang/crates.io-index"
1970+
checksum = "8b310ccceade8121d7d77fee406160e457c2f4e7c7982d589da3499bc7ea4526"
1971+
dependencies = [
1972+
"serde",
1973+
]
1974+
19561975
[[package]]
19571976
name = "lazy_static"
19581977
version = "1.4.0"
@@ -5223,6 +5242,19 @@ dependencies = [
52235242
"serde",
52245243
]
52255244

5245+
[[package]]
5246+
name = "toml_edit"
5247+
version = "0.13.0"
5248+
source = "registry+https://github.com/rust-lang/crates.io-index"
5249+
checksum = "3b80ac5e1b91e3378c63dab121962472b5ca20cf9ab1975e3d588548717807a8"
5250+
dependencies = [
5251+
"combine",
5252+
"indexmap",
5253+
"itertools 0.10.1",
5254+
"kstring",
5255+
"serde",
5256+
]
5257+
52265258
[[package]]
52275259
name = "topological-sort"
52285260
version = "0.1.0"

src/tools/cargo

Submodule cargo updated 49 files

0 commit comments

Comments
 (0)