diff options
| author | bors <bors@rust-lang.org> | 2018-06-28 22:20:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-06-28 22:20:14 +0000 |
| commit | 57dd722606028cafde656a66edc3206b82cd3bab (patch) | |
| tree | 8f515fb881d43a4874d3010c91b92696faafcd1f /src/test/ui/const-eval/conditional_array_execution.rs | |
| parent | e3bf634e060bc2f8665878288bcea02008ca346e (diff) | |
| parent | 3332c0c7e18a0669fd61d079e74c3d891033c32e (diff) | |
Auto merge of #51884 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 6 pull requests Successful merges: - #51636 (Refactor error reporting of constants) - #51765 (Use assert_eq! in copy_from_slice) - #51822 (Provide existing ref suggestions for more E0308 errors) - #51839 (Detect overflows of non u32 shifts) - #51868 (Remove process::id from 'Stabilized APIs' in 1.27.0 release notes) - #51875 (Explicitely disable WASM code generation for Emscripten) Failed merges: r? @ghost
Diffstat (limited to 'src/test/ui/const-eval/conditional_array_execution.rs')
| -rw-r--r-- | src/test/ui/const-eval/conditional_array_execution.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/test/ui/const-eval/conditional_array_execution.rs b/src/test/ui/const-eval/conditional_array_execution.rs index ac555b25afd..99487eb4979 100644 --- a/src/test/ui/const-eval/conditional_array_execution.rs +++ b/src/test/ui/const-eval/conditional_array_execution.rs @@ -13,8 +13,7 @@ const X: u32 = 5; const Y: u32 = 6; const FOO: u32 = [X - Y, Y - X][(X < Y) as usize]; -//~^ WARN attempt to subtract with overflow -//~| WARN this constant cannot be used +//~^ WARN this constant cannot be used fn main() { println!("{}", FOO); |