Skip to content

Commit 86481e1

Browse files
committed
remove feature(nll) in more cases.
1 parent af26372 commit 86481e1

33 files changed

+47
-81
lines changed

src/test/ui/issues/issue-27282-move-match-input-into-guard.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// reaches the panic code when executed, despite the compiler warning
88
// about that match arm being unreachable.
99

10-
#![feature(nll)]
11-
1210
fn main() {
1311
let b = &mut true;
1412
match b {

src/test/ui/issues/issue-27282-move-match-input-into-guard.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0382]: use of moved value: `b`
2-
--> $DIR/issue-27282-move-match-input-into-guard.rs:18:14
2+
--> $DIR/issue-27282-move-match-input-into-guard.rs:16:14
33
|
44
LL | let b = &mut true;
55
| - move occurs because `b` has type `&mut bool`, which does not implement the `Copy` trait

src/test/ui/issues/issue-27282-move-ref-mut-into-guard.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
// Issue 27282: Example 1: This sidesteps the AST checks disallowing
22
// mutable borrows in match guards by hiding the mutable borrow in a
33
// guard behind a move (of the ref mut pattern id) within a closure.
4-
//
5-
// This example is not rejected by AST borrowck (and then reliably
6-
// segfaults when executed).
7-
8-
#![feature(nll)]
94

105
fn main() {
116
match Some(&4) {

src/test/ui/issues/issue-27282-move-ref-mut-into-guard.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0507]: cannot move out of `foo` in pattern guard
2-
--> $DIR/issue-27282-move-ref-mut-into-guard.rs:14:19
2+
--> $DIR/issue-27282-move-ref-mut-into-guard.rs:9:19
33
|
44
LL | if { (|| { let bar = foo; bar.take() })(); false } => {},
55
| ^^ ---

src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
// diverges, and therefore a single final fake-read at the very end
1010
// after the final match arm would not suffice.
1111

12-
#![feature(nll)]
13-
1412
struct ForceFnOnce;
1513

1614
fn main() {

src/test/ui/issues/issue-27282-mutate-before-diverging-arm-1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0510]: cannot mutably borrow `x` in match guard
2-
--> $DIR/issue-27282-mutate-before-diverging-arm-1.rs:23:14
2+
--> $DIR/issue-27282-mutate-before-diverging-arm-1.rs:21:14
33
|
44
LL | match x {
55
| - value is immutable in match guard

src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
// occurs in the pattern-match itself, and not in the guard
1414
// expression.
1515

16-
#![feature(nll)]
17-
1816
struct ForceFnOnce;
1917

2018
fn main() {

src/test/ui/issues/issue-27282-mutate-before-diverging-arm-2.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0510]: cannot mutably borrow `x` in match guard
2-
--> $DIR/issue-27282-mutate-before-diverging-arm-2.rs:28:18
2+
--> $DIR/issue-27282-mutate-before-diverging-arm-2.rs:26:18
33
|
44
LL | match x {
55
| - value is immutable in match guard

src/test/ui/issues/issue-27282-mutate-before-diverging-arm-3.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// This case is interesting because a borrow of **x is untracked, because **x is
99
// immutable. However, for matches we care that **x refers to the same value
1010
// until we have chosen a match arm.
11-
#![feature(nll)]
11+
1212
struct ForceFnOnce;
1313
fn main() {
1414
let mut x = &mut &Some(&2);

src/test/ui/issues/issue-29723.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(nll)]
2-
31
// test for https://github.com/rust-lang/rust/issues/29723
42

53
fn main() {

0 commit comments

Comments
 (0)