Skip to content

Commit cefc592

Browse files
committed
bump Rust, fix error messages
1 parent 74c3ea5 commit cefc592

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6d77e45f01079fe3d40180b3e256e414ab379f63
1+
5c5c8eb864e56ce905742b8e97df5506bba6aeef

tests/compile-fail/never_say_never.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
fn main() {
77
let y = &5;
88
let x: ! = unsafe {
9-
*(y as *const _ as *const !) //~ ERROR entered unreachable code
9+
*(y as *const _ as *const !) //~ ERROR entering unreachable code
1010
};
1111
f(x)
1212
}

tests/compile-fail/never_transmute_humans.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ struct Human;
55

66
fn main() {
77
let _x: ! = unsafe {
8-
std::mem::transmute::<Human, !>(Human) //~ ERROR entered unreachable code
8+
std::mem::transmute::<Human, !>(Human) //~ ERROR entering unreachable code
99
};
1010
}

tests/compile-fail/never_transmute_void.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
enum Void {}
77

88
fn f(v: Void) -> ! {
9-
match v {} //~ ERROR entered unreachable code
9+
match v {} //~ ERROR entering unreachable code
1010
}
1111

1212
fn main() {

tests/compile-fail/out_of_bounds_ptr_2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// error-pattern: attempt to add with overflow
1+
// error-pattern: overflowing in-bounds pointer arithmetic
22
fn main() {
33
let v = [0i8; 4];
44
let x = &v as *const i8;

tests/compile-fail/ptr_offset_overflow.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//error-pattern: attempt to add with overflow
1+
//error-pattern: overflowing in-bounds pointer arithmetic
22
fn main() {
33
let v = [1i8, 2];
44
let x = &v[1] as *const i8;

0 commit comments

Comments
 (0)