Update Cargo submodule

Also update Cargo's dependencies while we're at it
This commit is contained in:
Alex Crichton 2018-08-21 10:23:47 -07:00
parent 39e6ba8218
commit 2863b75425
6 changed files with 442 additions and 416 deletions

File diff suppressed because it is too large Load Diff

View File

@ -8,11 +8,11 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
// aux-build:png.rs // aux-build:png2.rs
// edition:2018 // edition:2018
mod png { mod png {
use png as png_ext; use png2 as png_ext;
fn foo() -> png_ext::DecodingError { unimplemented!() } fn foo() -> png_ext::DecodingError { unimplemented!() }
} }

@ -1 +1 @@
Subproject commit 6a7672ef5344c1bb570610f2574250fbee932355 Subproject commit 0ec7281b9c36ca7f724bfac8b029633910270a48

View File

@ -22,23 +22,25 @@ syn = { version = "0.14", features = ['extra-traits'] }
[target.'cfg(windows)'.dependencies.winapi] [target.'cfg(windows)'.dependencies.winapi]
version = "0.3" version = "0.3"
features = [ features = [
"profileapi", "basetsd",
"jobapi",
"jobapi2",
"lmcons",
"memoryapi", "memoryapi",
"minschannel", "minschannel",
"securitybaseapi",
"jobapi2",
"schannel",
"sysinfoapi",
"jobapi",
"synchapi",
"wincrypt",
"winbase",
"minwinbase", "minwinbase",
"ntsecapi", "ntsecapi",
"basetsd",
"ntstatus", "ntstatus",
"profileapi",
"psapi", "psapi",
"schannel",
"securitybaseapi",
"shellapi",
"synchapi",
"sysinfoapi",
"timezoneapi", "timezoneapi",
"lmcons", "userenv",
"winbase",
"wincon", "wincon",
"wincrypt",
] ]

View File

@ -50,6 +50,7 @@ static EXCEPTIONS: &'static [&'static str] = &[
"colored", // MPL-2.0, rustfmt "colored", // MPL-2.0, rustfmt
"ordslice", // Apache-2.0, rls "ordslice", // Apache-2.0, rls
"cloudabi", // BSD-2-Clause, (rls -> crossbeam-channel 0.2 -> rand 0.5) "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? /// Which crates to check against the whitelist?
@ -68,9 +69,10 @@ static WHITELIST: &'static [Crate] = &[
Crate("bitflags"), Crate("bitflags"),
Crate("byteorder"), Crate("byteorder"),
Crate("cc"), Crate("cc"),
Crate("cfg-if"),
Crate("chalk-engine"), Crate("chalk-engine"),
Crate("chalk-macros"), Crate("chalk-macros"),
Crate("cfg-if"), Crate("cloudabi"),
Crate("cmake"), Crate("cmake"),
Crate("crossbeam-deque"), Crate("crossbeam-deque"),
Crate("crossbeam-epoch"), Crate("crossbeam-epoch"),
@ -103,6 +105,7 @@ static WHITELIST: &'static [Crate] = &[
Crate("pkg-config"), Crate("pkg-config"),
Crate("quick-error"), Crate("quick-error"),
Crate("rand"), Crate("rand"),
Crate("rand_core"),
Crate("redox_syscall"), Crate("redox_syscall"),
Crate("redox_termios"), Crate("redox_termios"),
Crate("regex"), Crate("regex"),
@ -125,6 +128,7 @@ static WHITELIST: &'static [Crate] = &[
Crate("unicode-width"), Crate("unicode-width"),
Crate("unreachable"), Crate("unreachable"),
Crate("utf8-ranges"), Crate("utf8-ranges"),
Crate("version_check"),
Crate("void"), Crate("void"),
Crate("winapi"), Crate("winapi"),
Crate("winapi-build"), Crate("winapi-build"),