about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDylan DPC <99973273+Dylan-DPC@users.noreply.github.com>2022-03-08 22:44:01 +0100
committerGitHub <noreply@github.com>2022-03-08 22:44:01 +0100
commit5629026e90f2bd9f345bea1d4834e41f80308d80 (patch)
treed1df657a73c8932873f712e641dc3dd9992ac05a
parenta67b6299b4b738e2f0482eba0549e64f8b5081a7 (diff)
parentd8e75bc1b7b538593f7ef3d55eedeb2f00fec474 (diff)
downloadrust-5629026e90f2bd9f345bea1d4834e41f80308d80.tar.gz
rust-5629026e90f2bd9f345bea1d4834e41f80308d80.zip
Rollup merge of #94730 - msabansal:sabansal/b-atomic-mut-ptr, r=Dylan-DPC
Reverted atomic_mut_ptr feature removal causing compilation break

Fixes a regression introduced as part of https://github.com/rust-lang/rust/pull/94546

Std no longer compiles on nightly while using the following commnd:

export RUSTFLAGS='-C target-feature=+atomics,+bulk-memory'
cargo build --target wasm32-unknown-unknown -Z build-std=panic_abort,std

I can help add tests to avoid future breaks but i couldn't understand the test framework
-rw-r--r--library/std/src/lib.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
index 5b02e711aab..c35389d44f9 100644
--- a/library/std/src/lib.rs
+++ b/library/std/src/lib.rs
@@ -231,6 +231,7 @@
 #![feature(assert_matches)]
 #![feature(associated_type_bounds)]
 #![feature(async_iterator)]
+#![feature(atomic_mut_ptr)]
 #![feature(bench_black_box)]
 #![feature(box_syntax)]
 #![feature(c_unwind)]