about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-09-06 11:41:57 +0200
committerMazdak Farrokhzad <twingoow@gmail.com>2019-09-26 06:44:57 +0200
commitece6f833dfe99db87d17c02efeaa8aac88ad302b (patch)
treeaf08f2c33ba4a7f1c0005ba0c91ba0a7d24cc004 /src
parenta5bc0f0e3f0c58518c0537d82dee0fcfeb57115c (diff)
downloadrust-ece6f833dfe99db87d17c02efeaa8aac88ad302b.tar.gz
rust-ece6f833dfe99db87d17c02efeaa8aac88ad302b.zip
Refuse downgrading NLL errors on Rust 2015.
Diffstat (limited to 'src')
-rw-r--r--src/librustc_mir/borrow_check/mod.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/librustc_mir/borrow_check/mod.rs b/src/librustc_mir/borrow_check/mod.rs
index 32c6dd67a4b..241a398a08c 100644
--- a/src/librustc_mir/borrow_check/mod.rs
+++ b/src/librustc_mir/borrow_check/mod.rs
@@ -259,10 +259,8 @@ fn do_mir_borrowck<'a, 'tcx>(
         move_error_reported: BTreeMap::new(),
         uninitialized_error_reported: Default::default(),
         errors_buffer,
-        // Only downgrade errors on Rust 2015 and refuse to do so on Rust 2018.
-        // FIXME(Centril): In Rust 1.40.0, refuse doing so on 2015 as well and
-        // proceed to throwing out the migration infrastructure.
-        disable_error_downgrading: body.span.rust_2018(),
+        // FIXME(Centril): throw out the migration infrastructure.
+        disable_error_downgrading: true,
         nonlexical_regioncx: regioncx,
         used_mut: Default::default(),
         used_mut_upvars: SmallVec::new(),