Various minor/cosmetic improvements to code

[rust.git] / src / librustc_typeck / variance / terms.rs

diff --git a/src/librustc_typeck/variance/terms.rs b/src/librustc_typeck/variance/terms.rs
index 3692221a3fc3fe324b37f748d8abc6f16fa65fea..75ff5bb0c5405ebf7e77df274d74af4f2fb147c7 100644 (file)
--- a/src/librustc_typeck/variance/terms.rs
+++ b/src/librustc_typeck/variance/terms.rs
@@ -91,7 +91,7 @@ pub fn determine_parameters_to_be_inferred<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>
     //
     // - https://rust-lang.github.io/rustc-guide/query.html
     // - https://rust-lang.github.io/rustc-guide/variance.html
-    tcx.hir.krate().visit_all_item_likes(&mut terms_cx);
+    tcx.hir().krate().visit_all_item_likes(&mut terms_cx);
 
     terms_cx
 }
@@ -106,14 +106,14 @@ fn lang_items(tcx: TyCtxt) -> Vec<(ast::NodeId, Vec<ty::Variance>)> {
     all.into_iter() // iterating over (Option<DefId>, Variance)
        .filter(|&(ref d,_)| d.is_some())
        .map(|(d, v)| (d.unwrap(), v)) // (DefId, Variance)
-       .filter_map(|(d, v)| tcx.hir.as_local_node_id(d).map(|n| (n, v))) // (NodeId, Variance)
+       .filter_map(|(d, v)| tcx.hir().as_local_node_id(d).map(|n| (n, v))) // (NodeId, Variance)
        .collect()
 }
 
 impl<'a, 'tcx> TermsContext<'a, 'tcx> {
     fn add_inferreds_for_item(&mut self, id: ast::NodeId) {
         let tcx = self.tcx;
-        let def_id = tcx.hir.local_def_id(id);
+        let def_id = tcx.hir().local_def_id(id);
         let count = tcx.generics_of(def_id).count();
 
         if count == 0 {
@@ -125,7 +125,7 @@ fn add_inferreds_for_item(&mut self, id: ast::NodeId) {
         let newly_added = self.inferred_starts.insert(id, InferredIndex(start)).is_none();
         assert!(newly_added);
 
-        // NB: In the code below for writing the results back into the
+        // N.B., in the code below for writing the results back into the
         // `CrateVariancesMap`, we rely on the fact that all inferreds
         // for a particular item are assigned continuous indices.
 
@@ -139,7 +139,7 @@ fn add_inferreds_for_item(&mut self, id: ast::NodeId) {
 impl<'a, 'tcx, 'v> ItemLikeVisitor<'v> for TermsContext<'a, 'tcx> {
     fn visit_item(&mut self, item: &hir::Item) {
         debug!("add_inferreds for item {}",
-               self.tcx.hir.node_to_string(item.id));
+               self.tcx.hir().node_to_string(item.id));
 
         match item.node {
             hir::ItemKind::Struct(ref struct_def, _) |