diff options
| author | bors <bors@rust-lang.org> | 2017-05-23 04:48:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-23 04:48:15 +0000 |
| commit | 852b7cb91ed44f6cc77f855bd8281da4accbd2fb (patch) | |
| tree | 0baca5f9b17776de133ffdd4f67bd728006279b9 /src/test/ui | |
| parent | 2e9139197e908435673c62a14381fbd4f8166319 (diff) | |
| parent | aa7762f91fc6ee18faf477800d9e5bddb8637507 (diff) | |
| download | rust-852b7cb91ed44f6cc77f855bd8281da4accbd2fb.tar.gz rust-852b7cb91ed44f6cc77f855bd8281da4accbd2fb.zip | |
Auto merge of #42165 - frewsxcv:rollup, r=frewsxcv
Rollup of 8 pull requests - Successful merges: #42016, #42122, #42144, #42145, #42151, #42152, #42160, #42163 - Failed merges:
Diffstat (limited to 'src/test/ui')
| -rw-r--r-- | src/test/ui/loop-break-value-no-repeat.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/loop-break-value-no-repeat.stderr | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/test/ui/loop-break-value-no-repeat.rs b/src/test/ui/loop-break-value-no-repeat.rs index 790f796fae0..b52d540fd75 100644 --- a/src/test/ui/loop-break-value-no-repeat.rs +++ b/src/test/ui/loop-break-value-no-repeat.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(loop_break_value)] #![allow(unused_variables)] use std::ptr; diff --git a/src/test/ui/loop-break-value-no-repeat.stderr b/src/test/ui/loop-break-value-no-repeat.stderr index 0d99abd3907..c154ea6f8c2 100644 --- a/src/test/ui/loop-break-value-no-repeat.stderr +++ b/src/test/ui/loop-break-value-no-repeat.stderr @@ -1,7 +1,7 @@ error[E0571]: `break` with value from a `for` loop - --> $DIR/loop-break-value-no-repeat.rs:23:9 + --> $DIR/loop-break-value-no-repeat.rs:22:9 | -23 | break 22 +22 | break 22 | ^^^^^^^^ can only break with a value inside `loop` error: aborting due to previous error |