Skip to content

Commit

Permalink
Fix some tests failing in --pass check mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@petrochenkov
petrochenkov committed Jan 17, 2020
1 parent 689fca0 commit 8fa8b81
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 25 deletions.
1 change: 1 addition & 0 deletions src/test/ui/consts/array-literal-index-oob.rs
View file
@@ -1,4 +1,5 @@
// build-pass
// ignore-pass (emit codegen-time warnings and verify that they are indeed warnings and not errors)

#![warn(const_err)]

Expand Down
8 changes: 4 additions & 4 deletions src/test/ui/consts/array-literal-index-oob.stderr
View file
@@ -1,25 +1,25 @@
warning: index out of bounds: the len is 3 but the index is 4
--> $DIR/array-literal-index-oob.rs:6:8
--> $DIR/array-literal-index-oob.rs:7:8
|
LL | &{ [1, 2, 3][4] };
| ^^^^^^^^^^^^
|
note: lint level defined here
--> $DIR/array-literal-index-oob.rs:3:9
--> $DIR/array-literal-index-oob.rs:4:9
|
LL | #![warn(const_err)]
| ^^^^^^^^^

warning: reaching this expression at runtime will panic or abort
--> $DIR/array-literal-index-oob.rs:6:8
--> $DIR/array-literal-index-oob.rs:7:8
|
LL | &{ [1, 2, 3][4] };
| ---^^^^^^^^^^^^--
| |
| indexing out of bounds: the len is 3 but the index is 4

warning: erroneous constant used
--> $DIR/array-literal-index-oob.rs:6:5
--> $DIR/array-literal-index-oob.rs:7:5
|
LL | &{ [1, 2, 3][4] };
| ^^^^^^^^^^^^^^^^^ referenced constant has errors
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/consts/const-eval/promoted_errors.rs
View file
@@ -1,4 +1,5 @@
// build-pass
// ignore-pass (emit codegen-time warnings and verify that they are indeed warnings and not errors)
// compile-flags: -O

#![warn(const_err)]
Expand Down
20 changes: 10 additions & 10 deletions src/test/ui/consts/const-eval/promoted_errors.stderr
View file
@@ -1,59 +1,59 @@
warning: this expression will panic at runtime
--> $DIR/promoted_errors.rs:8:14
--> $DIR/promoted_errors.rs:9:14
|
LL | let _x = 0u32 - 1;
| ^^^^^^^^ attempt to subtract with overflow
|
note: lint level defined here
--> $DIR/promoted_errors.rs:4:9
--> $DIR/promoted_errors.rs:5:9
|
LL | #![warn(const_err)]
| ^^^^^^^^^

warning: attempt to divide by zero
--> $DIR/promoted_errors.rs:10:20
--> $DIR/promoted_errors.rs:11:20
|
LL | println!("{}", 1 / (1 - 1));
| ^^^^^^^^^^^

warning: reaching this expression at runtime will panic or abort
--> $DIR/promoted_errors.rs:10:20
--> $DIR/promoted_errors.rs:11:20
|
LL | println!("{}", 1 / (1 - 1));
| ^^^^^^^^^^^ dividing by zero

warning: erroneous constant used
--> $DIR/promoted_errors.rs:10:20
--> $DIR/promoted_errors.rs:11:20
|
LL | println!("{}", 1 / (1 - 1));
| ^^^^^^^^^^^ referenced constant has errors

warning: attempt to divide by zero
--> $DIR/promoted_errors.rs:14:14
--> $DIR/promoted_errors.rs:15:14
|
LL | let _x = 1 / (1 - 1);
| ^^^^^^^^^^^

warning: attempt to divide by zero
--> $DIR/promoted_errors.rs:16:20
--> $DIR/promoted_errors.rs:17:20
|
LL | println!("{}", 1 / (false as u32));
| ^^^^^^^^^^^^^^^^^^

warning: reaching this expression at runtime will panic or abort
--> $DIR/promoted_errors.rs:16:20
--> $DIR/promoted_errors.rs:17:20
|
LL | println!("{}", 1 / (false as u32));
| ^^^^^^^^^^^^^^^^^^ dividing by zero

warning: erroneous constant used
--> $DIR/promoted_errors.rs:16:20
--> $DIR/promoted_errors.rs:17:20
|
LL | println!("{}", 1 / (false as u32));
| ^^^^^^^^^^^^^^^^^^ referenced constant has errors

warning: attempt to divide by zero
--> $DIR/promoted_errors.rs:20:14
--> $DIR/promoted_errors.rs:21:14
|
LL | let _x = 1 / (false as u32);
| ^^^^^^^^^^^^^^^^^^
Expand Down
1 change: 1 addition & 0 deletions src/test/ui/consts/const-eval/promoted_errors2.rs
View file
@@ -1,4 +1,5 @@
// build-pass
// ignore-pass (emit codegen-time warnings and verify that they are indeed warnings and not errors)
// compile-flags: -C overflow-checks=on -O

#![warn(const_err)]
Expand Down
22 changes: 11 additions & 11 deletions src/test/ui/consts/const-eval/promoted_errors2.stderr
View file
@@ -1,65 +1,65 @@
warning: attempt to subtract with overflow
--> $DIR/promoted_errors2.rs:7:20
--> $DIR/promoted_errors2.rs:8:20
|
LL | println!("{}", 0u32 - 1);
| ^^^^^^^^
|
note: lint level defined here
--> $DIR/promoted_errors2.rs:4:9
--> $DIR/promoted_errors2.rs:5:9
|
LL | #![warn(const_err)]
| ^^^^^^^^^

warning: attempt to subtract with overflow
--> $DIR/promoted_errors2.rs:9:14
--> $DIR/promoted_errors2.rs:10:14
|
LL | let _x = 0u32 - 1;
| ^^^^^^^^

warning: attempt to divide by zero
--> $DIR/promoted_errors2.rs:11:20
--> $DIR/promoted_errors2.rs:12:20
|
LL | println!("{}", 1 / (1 - 1));
| ^^^^^^^^^^^

warning: reaching this expression at runtime will panic or abort
--> $DIR/promoted_errors2.rs:11:20
--> $DIR/promoted_errors2.rs:12:20
|
LL | println!("{}", 1 / (1 - 1));
| ^^^^^^^^^^^ dividing by zero

warning: erroneous constant used
--> $DIR/promoted_errors2.rs:11:20
--> $DIR/promoted_errors2.rs:12:20
|
LL | println!("{}", 1 / (1 - 1));
| ^^^^^^^^^^^ referenced constant has errors

warning: attempt to divide by zero
--> $DIR/promoted_errors2.rs:15:14
--> $DIR/promoted_errors2.rs:16:14
|
LL | let _x = 1 / (1 - 1);
| ^^^^^^^^^^^

warning: attempt to divide by zero
--> $DIR/promoted_errors2.rs:17:20
--> $DIR/promoted_errors2.rs:18:20
|
LL | println!("{}", 1 / (false as u32));
| ^^^^^^^^^^^^^^^^^^

warning: reaching this expression at runtime will panic or abort
--> $DIR/promoted_errors2.rs:17:20
--> $DIR/promoted_errors2.rs:18:20
|
LL | println!("{}", 1 / (false as u32));
| ^^^^^^^^^^^^^^^^^^ dividing by zero

warning: erroneous constant used
--> $DIR/promoted_errors2.rs:17:20
--> $DIR/promoted_errors2.rs:18:20
|
LL | println!("{}", 1 / (false as u32));
| ^^^^^^^^^^^^^^^^^^ referenced constant has errors

warning: attempt to divide by zero
--> $DIR/promoted_errors2.rs:21:14
--> $DIR/promoted_errors2.rs:22:14
|
LL | let _x = 1 / (false as u32);
| ^^^^^^^^^^^^^^^^^^
Expand Down

0 comments on commit 8fa8b81

Please sign in to comment.