mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rustup to rustc 1.73.0-nightly (0308df23e 2023-07-21)

Browse Source
This commit is contained in:
bjorn3 2023-07-22 11:11:45 +00:00
parent a8a722f211
commit 4eabaf331f
5 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
patches/0027-coretests-128bit-atomic-operations.patch
View File

@ -10,6 +10,18 @@ Cranelift doesn't support them yet
library/core/tests/atomic.rs | 4 --- library/core/tests/atomic.rs | 4 ---
4 files changed, 4 insertions(+), 50 deletions(-) 4 files changed, 4 insertions(+), 50 deletions(-)
diff --git a/lib.rs b/lib.rs
index 897a5e9..331f66f 100644
--- a/lib.rs
+++ b/lib.rs
@@ -93,7 +93,6 @@
#![feature(const_option)]
#![feature(const_option_ext)]
#![feature(const_result)]
-#![cfg_attr(target_has_atomic = "128", feature(integer_atomics))]
#![feature(int_roundings)]
#![feature(slice_group_by)]
#![feature(split_array)]
diff --git a/atomic.rs b/atomic.rs diff --git a/atomic.rs b/atomic.rs
index b735957..ea728b6 100644 index b735957..ea728b6 100644
--- a/atomic.rs --- a/atomic.rs

15
patches/0027-stdlib-128bit-atomic-operations.patch
View File

@ -38,9 +38,9 @@ diff --git a/library/core/src/sync/atomic.rs b/library/core/src/sync/atomic.rs
index d9de37e..8293fce 100644 index d9de37e..8293fce 100644
--- a/library/core/src/sync/atomic.rs --- a/library/core/src/sync/atomic.rs
+++ b/library/core/src/sync/atomic.rs +++ b/library/core/src/sync/atomic.rs
@@ -2234,46 +2234,6 @@ atomic_int! { @@ -2996,42 +2996,6 @@ atomic_int! {
"AtomicU64::new(0)", 8,
u64 AtomicU64 ATOMIC_U64_INIT u64 AtomicU64
} }
-#[cfg(target_has_atomic_load_store = "128")] -#[cfg(target_has_atomic_load_store = "128")]
-atomic_int! { -atomic_int! {
@ -53,14 +53,12 @@ index d9de37e..8293fce 100644
- unstable(feature = "integer_atomics", issue = "99069"), - unstable(feature = "integer_atomics", issue = "99069"),
- unstable(feature = "integer_atomics", issue = "99069"), - unstable(feature = "integer_atomics", issue = "99069"),
- rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"), - rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
- unstable(feature = "integer_atomics", issue = "99069"),
- cfg_attr(not(test), rustc_diagnostic_item = "AtomicI128"), - cfg_attr(not(test), rustc_diagnostic_item = "AtomicI128"),
- "i128", - "i128",
- "#![feature(integer_atomics)]\n\n", - "#![feature(integer_atomics)]\n\n",
- atomic_min, atomic_max, - atomic_min, atomic_max,
- 16, - 16,
- "AtomicI128::new(0)", - i128 AtomicI128
- i128 AtomicI128 ATOMIC_I128_INIT
-} -}
-#[cfg(target_has_atomic_load_store = "128")] -#[cfg(target_has_atomic_load_store = "128")]
-atomic_int! { -atomic_int! {
@ -73,16 +71,15 @@ index d9de37e..8293fce 100644
- unstable(feature = "integer_atomics", issue = "99069"), - unstable(feature = "integer_atomics", issue = "99069"),
- unstable(feature = "integer_atomics", issue = "99069"), - unstable(feature = "integer_atomics", issue = "99069"),
- rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"), - rustc_const_stable(feature = "const_integer_atomics", since = "1.34.0"),
- unstable(feature = "integer_atomics", issue = "99069"),
- cfg_attr(not(test), rustc_diagnostic_item = "AtomicU128"), - cfg_attr(not(test), rustc_diagnostic_item = "AtomicU128"),
- "u128", - "u128",
- "#![feature(integer_atomics)]\n\n", - "#![feature(integer_atomics)]\n\n",
- atomic_umin, atomic_umax, - atomic_umin, atomic_umax,
- 16, - 16,
- "AtomicU128::new(0)", - u128 AtomicU128
- u128 AtomicU128 ATOMIC_U128_INIT
-} -}
#[cfg(target_has_atomic_load_store = "ptr")]
macro_rules! atomic_int_ptr_sized { macro_rules! atomic_int_ptr_sized {
( $($target_pointer_width:literal $align:literal)* ) => { $( ( $($target_pointer_width:literal $align:literal)* ) => { $(
-- --

4
patches/stdlib-lock.toml
View File

@ -163,9 +163,9 @@ dependencies = [
[[package]] [[package]]
name = "hermit-abi" name = "hermit-abi"
version = "0.3.1" version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
dependencies = [ dependencies = [
"compiler_builtins", "compiler_builtins",
"rustc-std-workspace-alloc", "rustc-std-workspace-alloc",

2
rust-toolchain
View File

@ -1,3 +1,3 @@
[toolchain] [toolchain]
channel = "nightly-2023-07-12" channel = "nightly-2023-07-22"
components = ["rust-src", "rustc-dev", "llvm-tools"] components = ["rust-src", "rustc-dev", "llvm-tools"]

4
src/driver/jit.rs
View File

@ -114,9 +114,9 @@ pub(crate) fn run_jit(tcx: TyCtxt<'_>, backend_config: BackendConfig) -> ! {
.iter() .iter()
.map(|cgu| cgu.items_in_deterministic_order(tcx).into_iter()) .map(|cgu| cgu.items_in_deterministic_order(tcx).into_iter())
.flatten() .flatten()
.collect::<FxHashMap<_, (_, _)>>() .collect::<FxHashMap<_, _>>()
.into_iter() .into_iter()
.collect::<Vec<(_, (_, _))>>(); .collect::<Vec<(_, _)>>();
tcx.sess.time("codegen mono items", || { tcx.sess.time("codegen mono items", || {
super::predefine_mono_items(tcx, &mut jit_module, &mono_items); super::predefine_mono_items(tcx, &mut jit_module, &mono_items);