-
Notifications
You must be signed in to change notification settings - Fork 12.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
As a driveby change, I made `#![feature(nll)]` *always* take precedence over `-Z borrowck`. The main effect this had is that it means tests with `#![feature(nll)]` will ignore uses of `-Z borrowck=compare`. This affected only one test as far as I can tell, and I think that test used `-Z borrowck=compare` only as a historical accident.
- Loading branch information
Showing
3 changed files
with
52 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,12 @@ | ||
error[E0626]: borrow may still be in use when generator yields (Ast) | ||
--> $DIR/generator-with-nll.rs:19:23 | ||
error[E0626]: borrow may still be in use when generator yields | ||
--> $DIR/generator-with-nll.rs:18:17 | ||
| | ||
LL | let _a = &mut true; //~ ERROR borrow may still be in use when generator yields (Ast) | ||
| ^^^^ | ||
... | ||
LL | yield (); | ||
| -------- possible yield occurs here | ||
|
||
error[E0626]: borrow may still be in use when generator yields (Ast) | ||
--> $DIR/generator-with-nll.rs:20:22 | ||
| | ||
LL | let b = &mut true; //~ ERROR borrow may still be in use when generator yields (Ast) | ||
| ^^^^ | ||
LL | //~^ borrow may still be in use when generator yields (Mir) | ||
LL | yield (); | ||
| -------- possible yield occurs here | ||
|
||
error[E0626]: borrow may still be in use when generator yields (Mir) | ||
--> $DIR/generator-with-nll.rs:20:17 | ||
| | ||
LL | let b = &mut true; //~ ERROR borrow may still be in use when generator yields (Ast) | ||
LL | let b = &mut true; | ||
| ^^^^^^^^^ | ||
LL | //~^ borrow may still be in use when generator yields (Mir) | ||
LL | //~^ borrow may still be in use when generator yields | ||
LL | yield (); | ||
| -------- possible yield occurs here | ||
|
||
error: aborting due to 3 previous errors | ||
error: aborting due to previous error | ||
|
||
For more information about this error, try `rustc --explain E0626`. |