From 7213b91cd4870ad878eb486e176346e832b5ed0b Mon Sep 17 00:00:00 2001 From: Matthew Jasper Date: Fri, 5 Apr 2019 10:00:44 +0100 Subject: [PATCH 1/2] Use edition flag for 2phase test The compiler now rejects one of the examples with #![feature(nll)] --- tests/run-pass/2phase.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/run-pass/2phase.rs b/tests/run-pass/2phase.rs index 5ca0ff5d8df8..9e50829fade8 100644 --- a/tests/run-pass/2phase.rs +++ b/tests/run-pass/2phase.rs @@ -1,4 +1,4 @@ -#![feature(nll)] +// edition:2018 trait S: Sized { fn tpb(&mut self, _s: Self) {} @@ -54,6 +54,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); From 3298102a64f21d39c87c371a1b98d4a16ea957a6 Mon Sep 17 00:00:00 2001 From: Matthew Jasper Date: Sat, 6 Apr 2019 16:17:33 +0100 Subject: [PATCH 2/2] Remove unnecessary test directive --- tests/run-pass/2phase.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/run-pass/2phase.rs b/tests/run-pass/2phase.rs index 9e50829fade8..57f363114370 100644 --- a/tests/run-pass/2phase.rs +++ b/tests/run-pass/2phase.rs @@ -1,5 +1,3 @@ -// edition:2018 - trait S: Sized { fn tpb(&mut self, _s: Self) {} }