diff options
| author | bjorn3 <bjorn3@users.noreply.github.com> | 2021-05-04 14:13:07 +0200 |
|---|---|---|
| committer | bjorn3 <bjorn3@users.noreply.github.com> | 2021-05-04 14:13:07 +0200 |
| commit | 6266e9d907ec2bfd90e0bf15dd0f3411430c612a (patch) | |
| tree | cdd5c43c9f6f2db910c81e77d2febddad9ca8ca6 /scripts | |
| parent | 7a61ec3007267e6cb4134b8042fa30bee8f2e88a (diff) | |
| download | rust-6266e9d907ec2bfd90e0bf15dd0f3411430c612a.tar.gz rust-6266e9d907ec2bfd90e0bf15dd0f3411430c612a.zip | |
Update rust bootstrap patches
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/setup_rust_fork.sh | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/scripts/setup_rust_fork.sh b/scripts/setup_rust_fork.sh index 4821a07ac5d..e342963de15 100644 --- a/scripts/setup_rust_fork.sh +++ b/scripts/setup_rust_fork.sh @@ -24,18 +24,6 @@ index 5bd1147cad5..10d68a2ff14 100644 + [patch."https://github.com/rust-lang/rust-clippy"] clippy_lints = { path = "src/tools/clippy/clippy_lints" } -diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml -index 23e689fcae7..5f077b765b6 100644 ---- a/compiler/rustc_data_structures/Cargo.toml -+++ b/compiler/rustc_data_structures/Cargo.toml -@@ -32,7 +32,6 @@ tempfile = "3.0.5" - - [dependencies.parking_lot] - version = "0.11" --features = ["nightly"] - - [target.'cfg(windows)'.dependencies] - winapi = { version = "0.3", features = ["fileapi", "psapi"] } diff --git a/library/alloc/Cargo.toml b/library/alloc/Cargo.toml index d95b5b7f17f..00b6f0e3635 100644 --- a/library/alloc/Cargo.toml @@ -45,7 +33,7 @@ index d95b5b7f17f..00b6f0e3635 100644 [dependencies] core = { path = "../core" } -compiler_builtins = { version = "0.1.39", features = ['rustc-dep-of-std'] } -+compiler_builtins = { version = "0.1.40", features = ['rustc-dep-of-std', 'no-asm'] } ++compiler_builtins = { version = "0.1.42", features = ['rustc-dep-of-std', 'no-asm'] } [dev-dependencies] rand = "0.7" |