nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 19:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename static_item to global_item

Browse Source
This commit is contained in:
Oliver Schneider 2016-06-09 11:27:12 +02:00
parent 040a501a68
commit 05eaa522a5
No known key found for this signature in database
GPG Key ID: 56D6EEA0FC67AC46
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/interpreter/stepper.rs
View File

@ -128,7 +128,7 @@ struct ConstantExtractor<'a, 'b: 'mir, 'mir: 'a, 'tcx: 'b> {
} }
impl<'a, 'b, 'mir, 'tcx> ConstantExtractor<'a, 'b, 'mir, 'tcx> { impl<'a, 'b, 'mir, 'tcx> ConstantExtractor<'a, 'b, 'mir, 'tcx> {
fn static_item(&mut self, def_id: DefId, substs: &'tcx subst::Substs<'tcx>, span: Span) { fn global_item(&mut self, def_id: DefId, substs: &'tcx subst::Substs<'tcx>, span: Span) {
let cid = ConstantId { let cid = ConstantId {
def_id: def_id, def_id: def_id,
substs: substs, substs: substs,
@ -156,7 +156,7 @@ impl<'a, 'b, 'mir, 'tcx> Visitor<'tcx> for ConstantExtractor<'a, 'b, 'mir, 'tcx>
// because the type is the actual function, not the signature of the function. // because the type is the actual function, not the signature of the function.
// Thus we can simply create a zero sized allocation in `evaluate_operand` // Thus we can simply create a zero sized allocation in `evaluate_operand`
} else { } else {
self.static_item(def_id, substs, constant.span); self.global_item(def_id, substs, constant.span);
} }
}, },
mir::Literal::Promoted { index } => { mir::Literal::Promoted { index } => {
@ -183,7 +183,7 @@ impl<'a, 'b, 'mir, 'tcx> Visitor<'tcx> for ConstantExtractor<'a, 'b, 'mir, 'tcx>
if let mir::Lvalue::Static(def_id) = *lvalue { if let mir::Lvalue::Static(def_id) = *lvalue {
let substs = self.gecx.tcx.mk_substs(subst::Substs::empty()); let substs = self.gecx.tcx.mk_substs(subst::Substs::empty());
let span = self.span; let span = self.span;
self.static_item(def_id, substs, span); self.global_item(def_id, substs, span);
} }
} }
} }