From be92f9d3d65b9d50689ead4a4a3a9d65b07e0b91 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Sun, 22 Jul 2018 13:30:16 +0200 Subject: [PATCH] Teach new error messages in MIR borrowck about promoted places --- src/librustc_mir/borrow_check/move_errors.rs | 1 + src/librustc_mir/borrow_check/mutability_errors.rs | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/librustc_mir/borrow_check/move_errors.rs b/src/librustc_mir/borrow_check/move_errors.rs index cc39ad897a5..7b9b99a7002 100644 --- a/src/librustc_mir/borrow_check/move_errors.rs +++ b/src/librustc_mir/borrow_check/move_errors.rs @@ -247,6 +247,7 @@ fn report(&self, error: GroupedMoveError<'tcx>) { Place::Projection(ref proj) => { proj.base == Place::Local(Local::new(1)) } + Place::Promoted(_) | Place::Local(_) | Place::Static(_) => unreachable!(), } } => diff --git a/src/librustc_mir/borrow_check/mutability_errors.rs b/src/librustc_mir/borrow_check/mutability_errors.rs index 2a074a84e63..0143d89d58b 100644 --- a/src/librustc_mir/borrow_check/mutability_errors.rs +++ b/src/librustc_mir/borrow_check/mutability_errors.rs @@ -122,6 +122,8 @@ pub(super) fn report_mutability_error( } } + Place::Promoted(_) => unreachable!(), + Place::Static(box Static { def_id, ty: _ }) => { if let Place::Static(_) = access_place { item_msg = format!("immutable static item `{}`", access_place_desc.unwrap()); -- 2.44.0