@@ -45,8 +45,6 @@ use std::collections::hash_map::Entry;
45
45
bitflags ! {
46
46
#[ derive( RustcEncodable , RustcDecodable ) ]
47
47
flags ConstQualif : u8 {
48
- // Const rvalue which can be placed behind a reference.
49
- const PURE_CONST = 0 ,
50
48
// Inner mutability (can not be placed behind a reference) or behind
51
49
// &mut in a non-global expression. Can be copied from static memory.
52
50
const MUTABLE_MEM = 1 << 0 ,
@@ -104,7 +102,7 @@ impl<'a, 'tcx> CheckCrateVisitor<'a, 'tcx> {
104
102
{
105
103
let ( old_mode, old_qualif) = ( self . mode , self . qualif ) ;
106
104
self . mode = mode;
107
- self . qualif = ConstQualif :: PURE_CONST ;
105
+ self . qualif = ConstQualif :: empty ( ) ;
108
106
let r = f ( self ) ;
109
107
self . mode = old_mode;
110
108
self . qualif = old_qualif;
@@ -128,7 +126,7 @@ impl<'a, 'tcx> CheckCrateVisitor<'a, 'tcx> {
128
126
Entry :: Occupied ( entry) => return * entry. get ( ) ,
129
127
Entry :: Vacant ( entry) => {
130
128
// Prevent infinite recursion on re-entry.
131
- entry. insert ( ConstQualif :: PURE_CONST ) ;
129
+ entry. insert ( ConstQualif :: empty ( ) ) ;
132
130
}
133
131
}
134
132
self . with_mode ( mode, |this| {
@@ -273,7 +271,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for CheckCrateVisitor<'a, 'tcx> {
273
271
274
272
fn visit_expr ( & mut self , ex : & ast:: Expr ) {
275
273
let mut outer = self . qualif ;
276
- self . qualif = ConstQualif :: PURE_CONST ;
274
+ self . qualif = ConstQualif :: empty ( ) ;
277
275
278
276
let node_ty = ty:: node_id_to_type ( self . tcx , ex. id ) ;
279
277
check_expr ( self , ex, node_ty) ;
0 commit comments