Skip to content

Commit 6266e9d

Browse files
committed
Update rust bootstrap patches
1 parent 7a61ec3 commit 6266e9d

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

scripts/setup_rust_fork.sh

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,6 @@ index 5bd1147cad5..10d68a2ff14 100644
2424
+
2525
[patch."https://github.com/rust-lang/rust-clippy"]
2626
clippy_lints = { path = "src/tools/clippy/clippy_lints" }
27-
diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml
28-
index 23e689fcae7..5f077b765b6 100644
29-
--- a/compiler/rustc_data_structures/Cargo.toml
30-
+++ b/compiler/rustc_data_structures/Cargo.toml
31-
@@ -32,7 +32,6 @@ tempfile = "3.0.5"
32-
33-
[dependencies.parking_lot]
34-
version = "0.11"
35-
-features = ["nightly"]
36-
37-
[target.'cfg(windows)'.dependencies]
38-
winapi = { version = "0.3", features = ["fileapi", "psapi"] }
3927
diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml
4028
index d95b5b7f17f..00b6f0e3635 100644
4129
--- a/library/alloc/Cargo.toml
@@ -45,7 +33,7 @@ index d95b5b7f17f..00b6f0e3635 100644
4533
[dependencies]
4634
core = { path = "../core" }
4735
-compiler_builtins = { version = "0.1.39", features = ['rustc-dep-of-std'] }
48-
+compiler_builtins = { version = "0.1.40", features = ['rustc-dep-of-std', 'no-asm'] }
36+
+compiler_builtins = { version = "0.1.42", features = ['rustc-dep-of-std', 'no-asm'] }
4937
5038
[dev-dependencies]
5139
rand = "0.7"

0 commit comments

Comments
 (0)