From 3df1eb2c2bad4e11406657204db9326663f61416 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Fri, 7 Feb 2014 16:42:47 -0500 Subject: [PATCH] Remove unused ConstMutability --- src/librustc/middle/borrowck/check_loans.rs | 4 +--- src/librustc/middle/borrowck/gather_loans/mod.rs | 6 ------ src/librustc/middle/borrowck/mod.rs | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/librustc/middle/borrowck/check_loans.rs b/src/librustc/middle/borrowck/check_loans.rs index b280da31c453..306285d23fc3 100644 --- a/src/librustc/middle/borrowck/check_loans.rs +++ b/src/librustc/middle/borrowck/check_loans.rs @@ -222,7 +222,6 @@ impl<'a> CheckLoanCtxt<'a> { let illegal_if = match loan2.mutbl { MutableMutability => RESTR_ALIAS | RESTR_FREEZE | RESTR_CLAIM, ImmutableMutability => RESTR_ALIAS | RESTR_FREEZE, - ConstMutability => RESTR_ALIAS, }; debug!("illegal_if={:?}", illegal_if); @@ -598,8 +597,7 @@ impl<'a> CheckLoanCtxt<'a> { // Check for a non-const loan of `loan_path` let cont = this.each_in_scope_loan(expr.id, |loan| { - if loan.loan_path == loan_path && - loan.mutbl != ConstMutability { + if loan.loan_path == loan_path { this.report_illegal_mutation(expr, full_loan_path, loan); diff --git a/src/librustc/middle/borrowck/gather_loans/mod.rs b/src/librustc/middle/borrowck/gather_loans/mod.rs index 173120e32f5c..759131a9a11e 100644 --- a/src/librustc/middle/borrowck/gather_loans/mod.rs +++ b/src/librustc/middle/borrowck/gather_loans/mod.rs @@ -568,11 +568,6 @@ impl<'a> GatherLoanCtxt<'a> { //! Implements the M-* rules in doc.rs. match req_mutbl { - ConstMutability => { - // Data of any mutability can be lent as const. - Ok(()) - } - ImmutableMutability => { // both imm and mut data can be lent as imm; // for mutable data, this is a freeze @@ -596,7 +591,6 @@ impl<'a> GatherLoanCtxt<'a> { pub fn restriction_set(&self, req_mutbl: LoanMutability) -> RestrictionSet { match req_mutbl { - ConstMutability => RESTR_EMPTY, ImmutableMutability => RESTR_EMPTY | RESTR_MUTATE | RESTR_CLAIM, MutableMutability => { RESTR_EMPTY | RESTR_MUTATE | RESTR_CLAIM | RESTR_FREEZE diff --git a/src/librustc/middle/borrowck/mod.rs b/src/librustc/middle/borrowck/mod.rs index 6f3578f667de..c52c21eef736 100644 --- a/src/librustc/middle/borrowck/mod.rs +++ b/src/librustc/middle/borrowck/mod.rs @@ -214,7 +214,6 @@ pub enum PartialTotal { #[deriving(Clone, Eq)] pub enum LoanMutability { ImmutableMutability, - ConstMutability, MutableMutability, } @@ -232,7 +231,6 @@ impl ToStr for LoanMutability { fn to_str(&self) -> ~str { match *self { ImmutableMutability => ~"immutable", - ConstMutability => ~"read-only", MutableMutability => ~"mutable", } }