From: Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>
Date: Thu, 9 Jun 2016 09:27:12 +0000 (+0200)
Subject: rename `static_item` to `global_item`
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=05eaa522a5486ba20bb564bf2b37179124d0951c;p=rust.git

rename `static_item` to `global_item`
---

diff --git a/src/interpreter/stepper.rs b/src/interpreter/stepper.rs
index db7b129eee6..a113b8f98e8 100644
--- a/src/interpreter/stepper.rs
+++ b/src/interpreter/stepper.rs
@@ -128,7 +128,7 @@ struct ConstantExtractor<'a, 'b: 'mir, 'mir: 'a, 'tcx: 'b> {
 }
 
 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 {
             def_id: def_id,
             substs: substs,
@@ -156,7 +156,7 @@ fn visit_constant(&mut self, constant: &mir::Constant<'tcx>) {
                     // 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`
                 } else {
-                    self.static_item(def_id, substs, constant.span);
+                    self.global_item(def_id, substs, constant.span);
                 }
             },
             mir::Literal::Promoted { index } => {
@@ -183,7 +183,7 @@ fn visit_lvalue(&mut self, lvalue: &mir::Lvalue<'tcx>, context: LvalueContext) {
         if let mir::Lvalue::Static(def_id) = *lvalue {
             let substs = self.gecx.tcx.mk_substs(subst::Substs::empty());
             let span = self.span;
-            self.static_item(def_id, substs, span);
+            self.global_item(def_id, substs, span);
         }
     }
 }