Skip to content

Commit

Permalink
update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
pvdrz committed Jun 19, 2020
1 parent 2f9d338 commit 014e605
Show file tree
Hide file tree
Showing 10 changed files with 90 additions and 17 deletions.
4 changes: 2 additions & 2 deletions src/test/ui/consts/const-mut-refs/const_mut_address_of.rs
@@ -1,5 +1,3 @@
// check-pass

#![feature(const_mut_refs)]
#![feature(const_fn)]
#![feature(raw_ref_op)]
Expand All @@ -24,7 +22,9 @@ const fn baz(foo: &mut Foo)-> *mut usize {

const _: () = {
foo().bar();
//~^ ERROR references in constants may only refer to immutable values
baz(&mut foo());
//~^ ERROR references in constants may only refer to immutable values
};

fn main() {}
21 changes: 21 additions & 0 deletions src/test/ui/consts/const-mut-refs/const_mut_address_of.stderr
@@ -0,0 +1,21 @@
error[E0658]: references in constants may only refer to immutable values
--> $DIR/const_mut_address_of.rs:24:5
|
LL | foo().bar();
| ^^^^^ constants require immutable values
|
= 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[E0658]: references in constants may only refer to immutable values
--> $DIR/const_mut_address_of.rs:26:9
|
LL | baz(&mut foo());
| ^^^^^^^^^^ constants require immutable values
|
= 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: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0658`.
5 changes: 3 additions & 2 deletions src/test/ui/consts/const-mut-refs/const_mut_refs.rs
@@ -1,5 +1,3 @@
// run-pass

#![feature(const_mut_refs)]

struct Foo {
Expand Down Expand Up @@ -31,6 +29,9 @@ const fn bazz(foo: &mut Foo) -> usize {

fn main() {
let _: [(); foo().bar()] = [(); 1];
//~^ ERROR references in constants may only refer to immutable values
let _: [(); baz(&mut foo())] = [(); 2];
//~^ ERROR references in constants may only refer to immutable values
let _: [(); bazz(&mut foo())] = [(); 3];
//~^ ERROR references in constants may only refer to immutable values
}
30 changes: 30 additions & 0 deletions src/test/ui/consts/const-mut-refs/const_mut_refs.stderr
@@ -0,0 +1,30 @@
error[E0658]: references in constants may only refer to immutable values
--> $DIR/const_mut_refs.rs:31:17
|
LL | let _: [(); foo().bar()] = [(); 1];
| ^^^^^ constants require immutable values
|
= 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[E0658]: references in constants may only refer to immutable values
--> $DIR/const_mut_refs.rs:33:21
|
LL | let _: [(); baz(&mut foo())] = [(); 2];
| ^^^^^^^^^^ constants require immutable values
|
= 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[E0658]: references in constants may only refer to immutable values
--> $DIR/const_mut_refs.rs:35:22
|
LL | let _: [(); bazz(&mut foo())] = [(); 3];
| ^^^^^^^^^^ constants require immutable values
|
= 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: aborting due to 3 previous errors

For more information about this error, try `rustc --explain E0658`.
11 changes: 10 additions & 1 deletion src/test/ui/consts/projection_qualif.mut_refs.stderr
@@ -1,3 +1,12 @@
error[E0658]: references in constants may only refer to immutable values
--> $DIR/projection_qualif.rs:10:27
|
LL | let b: *mut u32 = &mut a;
| ^^^^^^ constants require immutable values
|
= 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[E0658]: dereferencing raw pointers in constants is unstable
--> $DIR/projection_qualif.rs:11:18
|
Expand All @@ -7,6 +16,6 @@ LL | unsafe { *b = 5; }
= note: see issue #51911 <https://github.com/rust-lang/rust/issues/51911> for more information
= help: add `#![feature(const_raw_ptr_deref)]` to the crate attributes to enable

error: aborting due to previous error
error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0658`.
2 changes: 1 addition & 1 deletion src/test/ui/consts/projection_qualif.rs
Expand Up @@ -7,7 +7,7 @@ use std::cell::Cell;
const FOO: &u32 = {
let mut a = 42;
{
let b: *mut u32 = &mut a; //[stock]~ ERROR may only refer to immutable values
let b: *mut u32 = &mut a; //~ ERROR may only refer to immutable values
unsafe { *b = 5; } //~ ERROR dereferencing raw pointers in constants
//[stock]~^ contains unimplemented expression
}
Expand Down
8 changes: 3 additions & 5 deletions src/test/ui/consts/read_from_static_mut_ref.rs
@@ -1,10 +1,8 @@
// run-pass
#![feature(const_mut_refs)]
#![allow(const_err)]

static OH_YES: &mut i32 = &mut 42;

static OH_NO: &mut i32 = &mut 42;
//~^ ERROR references in statics may only refer to immutable values
fn main() {
// Make sure `OH_YES` can be read.
assert_eq!(*OH_YES, 42);
assert_eq!(*OH_NO, 42);
}
12 changes: 12 additions & 0 deletions src/test/ui/consts/read_from_static_mut_ref.stderr
@@ -0,0 +1,12 @@
error[E0658]: references in statics may only refer to immutable values
--> $DIR/read_from_static_mut_ref.rs:4:26
|
LL | static OH_NO: &mut i32 = &mut 42;
| ^^^^^^^ statics require immutable values
|
= 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: aborting due to previous error

For more information about this error, try `rustc --explain E0658`.
@@ -1,9 +1,12 @@
error[E0080]: could not evaluate static initializer
--> $DIR/static_mut_containing_mut_ref2.rs:7:45
error[E0658]: references in statics may only refer to immutable values
--> $DIR/static_mut_containing_mut_ref2.rs:7:46
|
LL | pub static mut STDERR_BUFFER: () = unsafe { *(&mut STDERR_BUFFER_SPACE) = 42; };
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ modifying a static's initial value from another static's initializer
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ statics require immutable values
|
= 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: aborting due to previous error

For more information about this error, try `rustc --explain E0080`.
For more information about this error, try `rustc --explain E0658`.
3 changes: 1 addition & 2 deletions src/test/ui/consts/static_mut_containing_mut_ref2.rs
Expand Up @@ -5,8 +5,7 @@
static mut STDERR_BUFFER_SPACE: u8 = 0;

pub static mut STDERR_BUFFER: () = unsafe { *(&mut STDERR_BUFFER_SPACE) = 42; };
//[mut_refs]~^ ERROR could not evaluate static initializer
//[stock]~^^ ERROR references in statics may only refer to immutable values
//~^ ERROR references in statics may only refer to immutable values
//[stock]~| ERROR static contains unimplemented expression type

fn main() {}

0 comments on commit 014e605

Please sign in to comment.