Skip to content

Commit 2863b75

Browse files
committed
Update Cargo submodule
Also update Cargo's dependencies while we're at it
1 parent 39e6ba8 commit 2863b75

File tree

6 files changed

+442
-416
lines changed

6 files changed

+442
-416
lines changed

src/Cargo.lock

+421-401
Large diffs are not rendered by default.

src/test/run-pass/issue-52705/main.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// aux-build:png.rs
11+
// aux-build:png2.rs
1212
// edition:2018
1313

1414
mod png {
15-
use png as png_ext;
15+
use png2 as png_ext;
1616

1717
fn foo() -> png_ext::DecodingError { unimplemented!() }
1818
}

src/tools/cargo

Submodule cargo updated 61 files

src/tools/rustc-workspace-hack/Cargo.toml

+13-11
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,25 @@ syn = { version = "0.14", features = ['extra-traits'] }
2222
[target.'cfg(windows)'.dependencies.winapi]
2323
version = "0.3"
2424
features = [
25-
"profileapi",
25+
"basetsd",
26+
"jobapi",
27+
"jobapi2",
28+
"lmcons",
2629
"memoryapi",
2730
"minschannel",
28-
"securitybaseapi",
29-
"jobapi2",
30-
"schannel",
31-
"sysinfoapi",
32-
"jobapi",
33-
"synchapi",
34-
"wincrypt",
35-
"winbase",
3631
"minwinbase",
3732
"ntsecapi",
38-
"basetsd",
3933
"ntstatus",
34+
"profileapi",
4035
"psapi",
36+
"schannel",
37+
"securitybaseapi",
38+
"shellapi",
39+
"synchapi",
40+
"sysinfoapi",
4141
"timezoneapi",
42-
"lmcons",
42+
"userenv",
43+
"winbase",
4344
"wincon",
45+
"wincrypt",
4446
]

src/tools/tidy/src/deps.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ static EXCEPTIONS: &'static [&'static str] = &[
5050
"colored", // MPL-2.0, rustfmt
5151
"ordslice", // Apache-2.0, rls
5252
"cloudabi", // BSD-2-Clause, (rls -> crossbeam-channel 0.2 -> rand 0.5)
53+
"ryu", // Apache-2.0, rls/cargo/... (b/c of serde)
5354
];
5455

5556
/// Which crates to check against the whitelist?
@@ -68,9 +69,10 @@ static WHITELIST: &'static [Crate] = &[
6869
Crate("bitflags"),
6970
Crate("byteorder"),
7071
Crate("cc"),
72+
Crate("cfg-if"),
7173
Crate("chalk-engine"),
7274
Crate("chalk-macros"),
73-
Crate("cfg-if"),
75+
Crate("cloudabi"),
7476
Crate("cmake"),
7577
Crate("crossbeam-deque"),
7678
Crate("crossbeam-epoch"),
@@ -103,6 +105,7 @@ static WHITELIST: &'static [Crate] = &[
103105
Crate("pkg-config"),
104106
Crate("quick-error"),
105107
Crate("rand"),
108+
Crate("rand_core"),
106109
Crate("redox_syscall"),
107110
Crate("redox_termios"),
108111
Crate("regex"),
@@ -125,6 +128,7 @@ static WHITELIST: &'static [Crate] = &[
125128
Crate("unicode-width"),
126129
Crate("unreachable"),
127130
Crate("utf8-ranges"),
131+
Crate("version_check"),
128132
Crate("void"),
129133
Crate("winapi"),
130134
Crate("winapi-build"),

0 commit comments

Comments
 (0)