Skip to content

Commit eff1c5d

Browse files
committed
Rustup to rustc 1.85.0-nightly (c44b3d50f 2024-12-03)
1 parent 812edd2 commit eff1c5d

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

patches/0022-coretests-Disable-not-compiling-tests.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ index 42a26ae..5ac1042 100644
3838
@@ -1,3 +1,4 @@
3939
+#![cfg(test)]
4040
// tidy-alphabetical-start
41-
#![cfg_attr(bootstrap, feature(const_three_way_compare))]
42-
#![cfg_attr(bootstrap, feature(strict_provenance))]
41+
#![cfg_attr(target_has_atomic = "128", feature(integer_atomics))]
42+
#![cfg_attr(test, feature(cfg_match))]
4343
--
4444
2.21.0 (Apple Git-122)

patches/0027-coretests-128bit-atomic-operations.patch

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ diff --git a/lib.rs b/lib.rs
1414
index 1e336bf..35e6f54 100644
1515
--- a/lib.rs
1616
+++ b/lib.rs
17-
@@ -2,7 +2,6 @@
18-
#![cfg_attr(bootstrap, feature(const_three_way_compare))]
19-
#![cfg_attr(bootstrap, feature(strict_provenance))]
20-
#![cfg_attr(not(bootstrap), feature(strict_provenance_lints))]
17+
@@ -2,6 +2,5 @@
18+
#![cfg(test)]
19+
// tidy-alphabetical-start
2120
-#![cfg_attr(target_has_atomic = "128", feature(integer_atomics))]
2221
#![cfg_attr(test, feature(cfg_match))]
2322
#![feature(alloc_layout_extra)]

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
2-
channel = "nightly-2024-11-28"
2+
channel = "nightly-2024-12-04"
33
components = ["rust-src", "rustc-dev", "llvm-tools"]
44
profile = "minimal"

src/driver/jit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use cranelift_jit::{JITBuilder, JITModule};
1111
use rustc_codegen_ssa::CrateInfo;
1212
use rustc_middle::mir::mono::MonoItem;
1313
use rustc_session::Session;
14-
use rustc_span::Symbol;
14+
use rustc_span::sym;
1515

1616
use crate::debuginfo::TypeDebugContext;
1717
use crate::prelude::*;

0 commit comments

Comments
 (0)