Rename MIR local iterators to match convention

diff --git a/src/librustc/mir/repr.rs b/src/librustc/mir/repr.rs
index 128d0d21da597c72c9e6d882a862ee5cb42767be..24224edf7be068689106146361c5ce67c0d6c6c5 100644 (file)
--- a/src/librustc/mir/repr.rs
+++ b/src/librustc/mir/repr.rs
@@ -188,7 +188,7 @@ pub fn local_kind(&self, local: Local) -> LocalKind {
 
     /// Returns an iterator over all temporaries.
     #[inline]
-    pub fn temp_iter<'a>(&'a self) -> impl Iterator<Item=Local> + 'a {
+    pub fn temps_iter<'a>(&'a self) -> impl Iterator<Item=Local> + 'a {
         (self.arg_count+1..self.local_decls.len()).filter_map(move |index| {
             let local = Local::new(index);
             if self.local_decls[local].source_info.is_none() {
@@ -201,7 +201,7 @@ pub fn temp_iter<'a>(&'a self) -> impl Iterator<Item=Local> + 'a {
 
     /// Returns an iterator over all user-declared locals.
     #[inline]
-    pub fn var_iter<'a>(&'a self) -> impl Iterator<Item=Local> + 'a {
+    pub fn vars_iter<'a>(&'a self) -> impl Iterator<Item=Local> + 'a {
         (self.arg_count+1..self.local_decls.len()).filter_map(move |index| {
             let local = Local::new(index);
             if self.local_decls[local].source_info.is_none() {
@@ -214,14 +214,14 @@ pub fn var_iter<'a>(&'a self) -> impl Iterator<Item=Local> + 'a {
 
     /// Returns an iterator over all function arguments.
     #[inline]
-    pub fn arg_iter<'a>(&'a self) -> impl Iterator<Item=Local> + 'a {
+    pub fn args_iter<'a>(&'a self) -> impl Iterator<Item=Local> + 'a {
         (1..self.arg_count+1).map(Local::new)
     }
 
     /// Returns an iterator over all user-defined variables and compiler-generated temporaries (all
     /// locals that are neither arguments nor the return pointer).
     #[inline]
-    pub fn var_and_temp_iter<'a>(&'a self) -> impl Iterator<Item=Local> + 'a {
+    pub fn vars_and_temps_iter<'a>(&'a self) -> impl Iterator<Item=Local> + 'a {
         (self.arg_count+1..self.local_decls.len()).map(Local::new)
     }
 

diff --git a/src/librustc_borrowck/borrowck/mir/mod.rs b/src/librustc_borrowck/borrowck/mir/mod.rs
index 450d29696e77d9ddb5d52021aa67e40d0d3d923a..2a3c602b134e77074342603728aaa7558f0126e7 100644 (file)
--- a/src/librustc_borrowck/borrowck/mir/mod.rs
+++ b/src/librustc_borrowck/borrowck/mir/mod.rs
@@ -338,7 +338,7 @@ fn drop_flag_effects_for_function_entry<'a, 'tcx, F>(
     where F: FnMut(MovePathIndex, DropFlagState)
 {
     let move_data = &ctxt.move_data;
-    for arg in mir.arg_iter() {
+    for arg in mir.args_iter() {
         let lvalue = repr::Lvalue::Local(arg);
         let lookup_result = move_data.rev_lookup.find(&lvalue);
         on_lookup_result_bits(tcx, mir, move_data,

diff --git a/src/librustc_mir/graphviz.rs b/src/librustc_mir/graphviz.rs
index 5d91f63ef52aac9c2a66e2c28634c88b69f24cc4..1c1f0ca790267fe5b66f43c21e74d115a9caf3ef 100644 (file)
--- a/src/librustc_mir/graphviz.rs
+++ b/src/librustc_mir/graphviz.rs
@@ -136,7 +136,7 @@ fn write_graph_label<'a, 'tcx, W: Write>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
     write!(w, "    label=<fn {}(", dot::escape_html(&tcx.node_path_str(nid)))?;
 
     // fn argument types.
-    for (i, arg) in mir.arg_iter().enumerate() {
+    for (i, arg) in mir.args_iter().enumerate() {
         if i > 0 {
             write!(w, ", ")?;
         }
@@ -146,7 +146,7 @@ fn write_graph_label<'a, 'tcx, W: Write>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
     write!(w, ") -&gt; {}", escape(mir.return_ty))?;
     write!(w, r#"<br align="left"/>"#)?;
 
-    for local in mir.var_and_temp_iter() {
+    for local in mir.vars_and_temps_iter() {
         let decl = &mir.local_decls[local];
 
         write!(w, "let ")?;

diff --git a/src/librustc_mir/pretty.rs b/src/librustc_mir/pretty.rs
index 7b5dbe72c513a7ce2019b7be7f4a3ac16558d017..5c88c89862126be6060d6e87a777087259f43a33 100644 (file)
--- a/src/librustc_mir/pretty.rs
+++ b/src/librustc_mir/pretty.rs
@@ -237,7 +237,7 @@ fn write_scope_tree(tcx: TyCtxt,
         writeln!(w, "{0:1$}scope {2} {{", "", indent, child.index())?;
 
         // User variable types (including the user's name in a comment).
-        for local in mir.var_iter() {
+        for local in mir.vars_iter() {
             let var = &mir.local_decls[local];
             let (name, source_info) = if var.source_info.unwrap().scope == child {
                 (var.name.unwrap(), var.source_info.unwrap())
@@ -333,7 +333,7 @@ fn write_mir_sig(tcx: TyCtxt, src: MirSource, mir: &Mir, w: &mut Write)
         write!(w, "(")?;
 
         // fn argument types.
-        for (i, arg) in mir.arg_iter().enumerate() {
+        for (i, arg) in mir.args_iter().enumerate() {
             if i != 0 {
                 write!(w, ", ")?;
             }
@@ -349,7 +349,7 @@ fn write_mir_sig(tcx: TyCtxt, src: MirSource, mir: &Mir, w: &mut Write)
 
 fn write_temp_decls(mir: &Mir, w: &mut Write) -> io::Result<()> {
     // Compiler-introduced temporary types.
-    for temp in mir.temp_iter() {
+    for temp in mir.temps_iter() {
         writeln!(w, "{}let mut {:?}: {};", INDENT, temp, mir.local_decls[temp].ty)?;
     }
 

diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs
index acc3084c906dcfc26d2a7ffc27ba8dfe49f2b07a..b00a88093d72655f5364a5c5f02daa12750d5fb2 100644 (file)
--- a/src/librustc_mir/transform/qualify_consts.rs
+++ b/src/librustc_mir/transform/qualify_consts.rs
@@ -410,7 +410,7 @@ fn qualify_const(&mut self) -> Qualif {
                 TerminatorKind::Return => {
                     // Check for unused values. This usually means
                     // there are extra statements in the AST.
-                    for temp in mir.temp_iter() {
+                    for temp in mir.temps_iter() {
                         if self.temp_qualif[temp].is_none() {
                             continue;
                         }
@@ -435,7 +435,7 @@ fn qualify_const(&mut self) -> Qualif {
 
                     // Make sure there are no extra unassigned variables.
                     self.qualif = Qualif::NOT_CONST;
-                    for index in mir.var_iter() {
+                    for index in mir.vars_iter() {
                         if !self.const_fn_arg_vars.contains(index.index()) {
                             debug!("unassigned variable {:?}", index);
                             self.assign(&Lvalue::Local(index), Location {

diff --git a/src/librustc_trans/debuginfo/create_scope_map.rs b/src/librustc_trans/debuginfo/create_scope_map.rs
index f453b27f9b97a87bbf0b34e105c1038cff2a0b7a..1d7e4991aa847e4566d77f4dc9bb23224cc5f889 100644 (file)
--- a/src/librustc_trans/debuginfo/create_scope_map.rs
+++ b/src/librustc_trans/debuginfo/create_scope_map.rs
@@ -63,7 +63,7 @@ pub fn create_mir_scopes(fcx: &FunctionContext) -> IndexVec<VisibilityScope, Mir
 
     // Find all the scopes with variables defined in them.
     let mut has_variables = BitVector::new(mir.visibility_scopes.len());
-    for var in mir.var_iter() {
+    for var in mir.vars_iter() {
         let decl = &mir.local_decls[var];
         has_variables.insert(decl.source_info.unwrap().scope.index());
     }

diff --git a/src/librustc_trans/mir/mod.rs b/src/librustc_trans/mir/mod.rs
index 2bd258059ad25a4a0b56fd96234c3fa647accbe2..97e05ed33d989bc57cebd616b9e9abc62a547d9e 100644 (file)
--- a/src/librustc_trans/mir/mod.rs
+++ b/src/librustc_trans/mir/mod.rs
@@ -290,7 +290,7 @@ pub fn trans_mir<'blk, 'tcx: 'blk>(fcx: &'blk FunctionContext<'blk, 'tcx>) {
         let retptr = allocate_local(mir::RETURN_POINTER);
         iter::once(retptr)
             .chain(args.into_iter())
-            .chain(mir.var_and_temp_iter().map(&mut allocate_local))
+            .chain(mir.vars_and_temps_iter().map(&mut allocate_local))
             .collect()
     };
 
@@ -356,7 +356,7 @@ fn arg_local_refs<'bcx, 'tcx>(bcx: &BlockAndBuilder<'bcx, 'tcx>,
         None
     };
 
-    mir.arg_iter().enumerate().map(|(arg_index, local)| {
+    mir.args_iter().enumerate().map(|(arg_index, local)| {
         let arg_decl = &mir.local_decls[local];
         let arg_ty = bcx.monomorphize(&arg_decl.ty);