Skip to content

Commit b6fc4b1

Browse files
committed
Refuse downgrading NLL errors on Rust 2015.
1 parent 6c2c29c commit b6fc4b1

File tree

1 file changed

+2
-4
lines changed
  • src/librustc_mir/borrow_check

1 file changed

+2
-4
lines changed

src/librustc_mir/borrow_check/mod.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,8 @@ fn do_mir_borrowck<'a, 'tcx>(
259259
move_error_reported: BTreeMap::new(),
260260
uninitialized_error_reported: Default::default(),
261261
errors_buffer,
262-
// Only downgrade errors on Rust 2015 and refuse to do so on Rust 2018.
263-
// FIXME(Centril): In Rust 1.40.0, refuse doing so on 2015 as well and
264-
// proceed to throwing out the migration infrastructure.
265-
disable_error_downgrading: body.span.rust_2018(),
262+
// FIXME(Centril): throw out the migration infrastructure.
263+
disable_error_downgrading: true,
266264
nonlexical_regioncx: regioncx,
267265
used_mut: Default::default(),
268266
used_mut_upvars: SmallVec::new(),

0 commit comments

Comments
 (0)