Skip to content

Commit 4d9b476

Browse files
committed
Update dependencies with reported vulnerabilities
bumpalo 3.12.1 (yanked) * updated to 3.13.0 tokio 1.8.4 - https://rustsec.org/advisories/RUSTSEC-2023-0001 * updated to 1.28.2 remove_dir_all 0.5.3 - https://rustsec.org/advisories/RUSTSEC-2023-0018 * removed by using the standard library function in `rust-installer` instead and updating to `[email protected]` (which also removes the dependency).
1 parent 0939ec1 commit 4d9b476

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

Cargo.lock

+23-25
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,9 @@ dependencies = [
316316

317317
[[package]]
318318
name = "bumpalo"
319-
version = "3.12.1"
319+
version = "3.13.0"
320320
source = "registry+https://github.com/rust-lang/crates.io-index"
321-
checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8"
321+
checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
322322

323323
[[package]]
324324
name = "bytecount"
@@ -1219,7 +1219,7 @@ checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412"
12191219
dependencies = [
12201220
"cfg-if",
12211221
"libc",
1222-
"redox_syscall",
1222+
"redox_syscall 0.2.10",
12231223
"windows-sys 0.45.0",
12241224
]
12251225

@@ -1761,7 +1761,6 @@ dependencies = [
17611761
"flate2",
17621762
"num_cpus",
17631763
"rayon",
1764-
"remove_dir_all",
17651764
"tar",
17661765
"walkdir",
17671766
"xz2",
@@ -2445,7 +2444,7 @@ dependencies = [
24452444
"cfg-if",
24462445
"instant",
24472446
"libc",
2448-
"redox_syscall",
2447+
"redox_syscall 0.2.10",
24492448
"smallvec",
24502449
"winapi",
24512450
]
@@ -2458,7 +2457,7 @@ checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
24582457
dependencies = [
24592458
"cfg-if",
24602459
"libc",
2461-
"redox_syscall",
2460+
"redox_syscall 0.2.10",
24622461
"smallvec",
24632462
"windows-sys 0.42.0",
24642463
]
@@ -2801,14 +2800,23 @@ dependencies = [
28012800
"bitflags",
28022801
]
28032802

2803+
[[package]]
2804+
name = "redox_syscall"
2805+
version = "0.3.5"
2806+
source = "registry+https://github.com/rust-lang/crates.io-index"
2807+
checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
2808+
dependencies = [
2809+
"bitflags",
2810+
]
2811+
28042812
[[package]]
28052813
name = "redox_users"
28062814
version = "0.4.0"
28072815
source = "registry+https://github.com/rust-lang/crates.io-index"
28082816
checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
28092817
dependencies = [
28102818
"getrandom",
2811-
"redox_syscall",
2819+
"redox_syscall 0.2.10",
28122820
]
28132821

28142822
[[package]]
@@ -2860,15 +2868,6 @@ version = "0.1.0"
28602868
name = "remote-test-server"
28612869
version = "0.1.0"
28622870

2863-
[[package]]
2864-
name = "remove_dir_all"
2865-
version = "0.5.3"
2866-
source = "registry+https://github.com/rust-lang/crates.io-index"
2867-
checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
2868-
dependencies = [
2869-
"winapi",
2870-
]
2871-
28722871
[[package]]
28732872
name = "replace-version-placeholder"
28742873
version = "0.1.0"
@@ -4789,16 +4788,15 @@ dependencies = [
47894788

47904789
[[package]]
47914790
name = "tempfile"
4792-
version = "3.3.0"
4791+
version = "3.5.0"
47934792
source = "registry+https://github.com/rust-lang/crates.io-index"
4794-
checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
4793+
checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
47954794
dependencies = [
47964795
"cfg-if",
47974796
"fastrand",
4798-
"libc",
4799-
"redox_syscall",
4800-
"remove_dir_all",
4801-
"winapi",
4797+
"redox_syscall 0.3.5",
4798+
"rustix",
4799+
"windows-sys 0.45.0",
48024800
]
48034801

48044802
[[package]]
@@ -4984,14 +4982,14 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
49844982

49854983
[[package]]
49864984
name = "tokio"
4987-
version = "1.8.4"
4985+
version = "1.28.2"
49884986
source = "registry+https://github.com/rust-lang/crates.io-index"
4989-
checksum = "50dae83881bc9b0403dd5b44ea9deed3e939856cc8722d5be37f0d6e5c6d53dd"
4987+
checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
49904988
dependencies = [
49914989
"autocfg",
49924990
"bytes",
4993-
"memchr",
49944991
"pin-project-lite",
4992+
"windows-sys 0.48.0",
49954993
]
49964994

49974995
[[package]]

compiler/rustc_data_structures/src/temp_dir.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ impl Drop for MaybeTempDir {
1616
// occur.
1717
let dir = unsafe { ManuallyDrop::take(&mut self.dir) };
1818
if self.keep {
19-
dir.into_path();
19+
let _ = dir.into_path();
2020
}
2121
}
2222
}

src/tools/rust-installer/Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ tar = "0.4.38"
1717
walkdir = "2"
1818
xz2 = "0.1.4"
1919
num_cpus = "1"
20-
remove_dir_all = "0.5"
2120

2221
[dependencies.clap]
2322
features = ["derive"]

src/tools/rust-installer/src/util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ pub fn open_file<P: AsRef<Path>>(path: P) -> Result<fs::File> {
8282

8383
/// Wraps `remove_dir_all` with a nicer error message.
8484
pub fn remove_dir_all<P: AsRef<Path>>(path: P) -> Result<()> {
85-
remove_dir_all::remove_dir_all(path.as_ref())
85+
fs::remove_dir_all(path.as_ref())
8686
.with_context(|| format!("failed to remove dir '{}'", path.as_ref().display()))?;
8787
Ok(())
8888
}

src/tools/tidy/src/deps.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,14 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
168168
"instant",
169169
"intl-memoizer",
170170
"intl_pluralrules",
171+
"io-lifetimes",
171172
"itertools",
172173
"itoa",
173174
"jobserver",
174175
"lazy_static",
175176
"libc",
176177
"libloading",
178+
"linux-raw-sys",
177179
"litemap",
178180
"lock_api",
179181
"log",
@@ -211,12 +213,12 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
211213
"regex",
212214
"regex-automata",
213215
"regex-syntax",
214-
"remove_dir_all",
215216
"rustc-demangle",
216217
"rustc-hash",
217218
"rustc-rayon",
218219
"rustc-rayon-core",
219220
"rustc_version",
221+
"rustix",
220222
"ruzstd", // via object in thorin-dwp
221223
"ryu",
222224
"scoped-tls",
@@ -280,6 +282,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
280282
"winapi-util",
281283
"winapi-x86_64-pc-windows-gnu",
282284
"windows",
285+
"windows-sys",
283286
"windows-targets",
284287
"windows_aarch64_gnullvm",
285288
"windows_aarch64_msvc",

0 commit comments

Comments
 (0)