提交 36f14b95 编写于 作者: B bors

Auto merge of #53567 - alexcrichton:update-cargo, r=Mark-Simulacrum

Update Cargo submodule

Also update Cargo's dependencies while we're at it
此差异已折叠。
......@@ -8,11 +8,11 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// aux-build:png.rs
// aux-build:png2.rs
// edition:2018
mod png {
use png as png_ext;
use png2 as png_ext;
fn foo() -> png_ext::DecodingError { unimplemented!() }
}
......
Subproject commit 6a7672ef5344c1bb570610f2574250fbee932355
Subproject commit 0ec7281b9c36ca7f724bfac8b029633910270a48
......@@ -22,23 +22,25 @@ syn = { version = "0.14", features = ['extra-traits'] }
[target.'cfg(windows)'.dependencies.winapi]
version = "0.3"
features = [
"profileapi",
"basetsd",
"jobapi",
"jobapi2",
"lmcons",
"memoryapi",
"minschannel",
"securitybaseapi",
"jobapi2",
"schannel",
"sysinfoapi",
"jobapi",
"synchapi",
"wincrypt",
"winbase",
"minwinbase",
"ntsecapi",
"basetsd",
"ntstatus",
"profileapi",
"psapi",
"schannel",
"securitybaseapi",
"shellapi",
"synchapi",
"sysinfoapi",
"timezoneapi",
"lmcons",
"userenv",
"winbase",
"wincon",
"wincrypt",
]
......@@ -50,6 +50,7 @@
"colored", // MPL-2.0, rustfmt
"ordslice", // Apache-2.0, rls
"cloudabi", // BSD-2-Clause, (rls -> crossbeam-channel 0.2 -> rand 0.5)
"ryu", // Apache-2.0, rls/cargo/... (b/c of serde)
];
/// Which crates to check against the whitelist?
......@@ -68,9 +69,10 @@
Crate("bitflags"),
Crate("byteorder"),
Crate("cc"),
Crate("cfg-if"),
Crate("chalk-engine"),
Crate("chalk-macros"),
Crate("cfg-if"),
Crate("cloudabi"),
Crate("cmake"),
Crate("crossbeam-deque"),
Crate("crossbeam-epoch"),
......@@ -103,6 +105,7 @@
Crate("pkg-config"),
Crate("quick-error"),
Crate("rand"),
Crate("rand_core"),
Crate("redox_syscall"),
Crate("redox_termios"),
Crate("regex"),
......@@ -125,6 +128,7 @@
Crate("unicode-width"),
Crate("unreachable"),
Crate("utf8-ranges"),
Crate("version_check"),
Crate("void"),
Crate("winapi"),
Crate("winapi-build"),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册