mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "With the revert of PR 83091, swap is not a const fn anymore."

Browse source 
This reverts commit 34deda3cc2.
This commit is contained in:
Albin Hedman 2021-06-14 17:35:29 +02:00
parent 38e9538122
commit 7de63be56d
No known key found for this signature in database
GPG key ID: 1F501ECD1BBD70A7
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/test/ui/thread-local-static.rs
View file

@ -11,7 +11,6 @@ const fn g(x: &mut [u32; 8]) {
//~| ERROR mutable references are not allowed
//~| ERROR use of mutable static is unsafe
//~| constant functions cannot refer to statics
//~| ERROR calls in constant functions are limited to constant functions
}
fn main() {}

10
src/test/ui/thread-local-static.stderr
View file

@ -30,12 +30,6 @@ LL | std::mem::swap(x, &mut STATIC_VAR_2)
= note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
= help: add `#![feature(const_mut_refs)]` to the crate attributes to enable
error[E0015]: calls in constant functions are limited to constant functions, tuple structs and tuple variants
--> $DIR/thread-local-static.rs:9:5
|
LL | std::mem::swap(x, &mut STATIC_VAR_2)
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error[E0133]: use of mutable static is unsafe and requires unsafe function or block
--> $DIR/thread-local-static.rs:9:23
|
@ -44,7 +38,7 @@ LL | std::mem::swap(x, &mut STATIC_VAR_2)
|
= note: mutable statics can be mutated by multiple threads: aliasing violations or data races will cause undefined behavior
error: aborting due to 6 previous errors
error: aborting due to 5 previous errors
Some errors have detailed explanations: E0013, E0015, E0133, E0658.
Some errors have detailed explanations: E0013, E0133, E0658.
For more information about an error, try `rustc --explain E0013`.