diff --git a/src/librustc/infer/mod.rs b/src/librustc/infer/mod.rs index 65bc2b3e945c..fc209df8516c 100644 --- a/src/librustc/infer/mod.rs +++ b/src/librustc/infer/mod.rs @@ -97,9 +97,8 @@ impl SuppressRegionErrors { // If we're on Migrate mode, report AST region errors BorrowckMode::Migrate => SuppressRegionErrors { suppressed: false }, - // If we're on MIR or Compare mode, don't report AST region errors as they should - // be reported by NLL - BorrowckMode::Compare | BorrowckMode::Mir => SuppressRegionErrors { suppressed: true }, + // If we're on MIR don't report AST region errors as they should be reported by NLL + BorrowckMode::Mir => SuppressRegionErrors { suppressed: true }, } } } diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs index 4682eb547836..4577c06fc68d 100644 --- a/src/librustc/session/config.rs +++ b/src/librustc/session/config.rs @@ -462,7 +462,6 @@ pub enum PrintRequest { #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)] pub enum BorrowckMode { Mir, - Compare, Migrate, } @@ -471,7 +470,6 @@ impl BorrowckMode { /// on the AST borrow check if the MIR-based one errors. pub fn migrate(self) -> bool { match self { - BorrowckMode::Compare => false, BorrowckMode::Mir => false, BorrowckMode::Migrate => true, } @@ -480,7 +478,6 @@ impl BorrowckMode { /// Should we emit the AST-based borrow checker errors? pub fn use_ast(self) -> bool { match self { - BorrowckMode::Compare => true, BorrowckMode::Mir => false, BorrowckMode::Migrate => false, } @@ -2315,7 +2312,6 @@ pub fn build_session_options_and_crate_config( let borrowck_mode = match debugging_opts.borrowck.as_ref().map(|s| &s[..]) { None | Some("migrate") => BorrowckMode::Migrate, Some("mir") => BorrowckMode::Mir, - Some("compare") => BorrowckMode::Compare, Some(m) => early_error(error_format, &format!("unknown borrowck mode `{}`", m)), };