Merge pull request #674 from matthewjasper/2phase-on-edition

RalfJung · web-flow · commit b8b52b0734ef · 2019-04-06T17:54:02.000+01:00
Use edition flag for 2phase test
diff --git a/tests/run-pass/2phase.rs b/tests/run-pass/2phase.rs
@@ -1,5 +1,3 @@
-#![feature(nll)]
-
 trait S: Sized {
     fn tpb(&mut self, _s: Self) {}
 }
@@ -54,6 +52,8 @@ fn with_interior_mutability() {
 
     let mut x = Cell::new(1);
     let l = &x;
+
+    #[allow(unknown_lints, mutable_borrow_reservation_conflict)]
     x
         .do_the_thing({
             x.set(3);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#![feature(nll)]`
`2`		`-`
`3`	`1`	`trait S: Sized {`
`4`	`2`	`fn tpb(&mut self, _s: Self) {}`
`5`	`3`	`}`
`@@ -54,6 +52,8 @@ fn with_interior_mutability() {`
`54`	`52`
`55`	`53`	`let mut x = Cell::new(1);`
`56`	`54`	`let l = &x;`
	`55`	`+`
	`56`	`+ #[allow(unknown_lints, mutable_borrow_reservation_conflict)]`
`57`	`57`	`x`
`58`	`58`	`.do_the_thing({`
`59`	`59`	`x.set(3);`