提交 d502eda2 编写于 作者: B bors

Auto merge of #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)
......@@ -379,7 +379,7 @@ dependencies = [
"tar",
"tempfile",
"termcolor",
"toml",
"toml_edit",
"unicode-width",
"unicode-xid",
"url 2.2.2",
......@@ -465,7 +465,7 @@ dependencies = [
"serde_json",
"tar",
"termcolor",
"toml",
"toml_edit",
"url 2.2.2",
]
......@@ -731,6 +731,16 @@ dependencies = [
"winapi",
]
[[package]]
name = "combine"
version = "4.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062"
dependencies = [
"bytes",
"memchr",
]
[[package]]
name = "commoncrypto"
version = "0.2.0"
......@@ -1953,6 +1963,15 @@ dependencies = [
"unicase",
]
[[package]]
name = "kstring"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b310ccceade8121d7d77fee406160e457c2f4e7c7982d589da3499bc7ea4526"
dependencies = [
"serde",
]
[[package]]
name = "lazy_static"
version = "1.4.0"
......@@ -5223,6 +5242,19 @@ dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b80ac5e1b91e3378c63dab121962472b5ca20cf9ab1975e3d588548717807a8"
dependencies = [
"combine",
"indexmap",
"itertools 0.10.1",
"kstring",
"serde",
]
[[package]]
name = "topological-sort"
version = "0.1.0"
......
Subproject commit 95bb3c92bf516017e812e7f1c14c2dea3845b30e
Subproject commit 1c034752de0df744fcd7788fcbca158830b8bf85
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册