Addressed review points.

3 files changed, 23 insertions, 28 deletions

diff --git a/src/librustc/traits/mod.rs b/src/librustc/traits/mod.rs
index 627f923399b..a792c439f5b 100644
--- a/src/librustc/traits/mod.rs
+++ b/src/librustc/traits/mod.rs
@@ -1044,7 +1044,7 @@ fn vtable_methods<'a, 'tcx>(
     )
 }
 
-impl<'tcx, O> Obligation<'tcx,O> {
+impl<'tcx, O> Obligation<'tcx, O> {
     pub fn new(cause: ObligationCause<'tcx>,
                param_env: ty::ParamEnv<'tcx>,
                predicate: O)
diff --git a/src/librustc/traits/util.rs b/src/librustc/traits/util.rs
index 897681e538e..4cb3f551123 100644
--- a/src/librustc/traits/util.rs
+++ b/src/librustc/traits/util.rs
@@ -107,7 +107,7 @@ pub fn elaborate_predicates<'cx, 'gcx, 'tcx>(
 {
     let mut visited = PredicateSet::new(tcx);
     predicates.retain(|pred| visited.insert(pred));
-    Elaborator { stack: predicates, visited: visited }
+    Elaborator { stack: predicates, visited }
 }
 
 impl<'cx, 'gcx, 'tcx> Elaborator<'cx, 'gcx, 'tcx> {
@@ -286,19 +286,21 @@ pub fn expand_trait_refs<'cx, 'gcx, 'tcx>(
     let mut items: Vec<_> =
         trait_refs
             .into_iter()
-            .map(|(tr, sp)| TraitRefExpansionInfo {
-                top_level_trait_ref: tr.clone(),
-                top_level_span: sp,
-                trait_ref: tr,
-                span: sp,
+            .map(|(trait_ref, span)| TraitRefExpansionInfo {
+                top_level_trait_ref: trait_ref.clone(),
+                top_level_span: span,
+                trait_ref,
+                span,
             })
             .collect();
     items.retain(|item| visited.insert(&item.trait_ref.to_predicate()));
-    TraitRefExpander { stack: items, visited: visited, }
+    TraitRefExpander { stack: items, visited }
 }
 
 impl<'cx, 'gcx, 'tcx> TraitRefExpander<'cx, 'gcx, 'tcx> {
-    // Returns `true` if `item` refers to a trait.
+    /// If `item` refers to a trait alias, adds the components of the trait alias to the stack,
+    /// and returns `false`.
+    /// If `item` refers to an ordinary trait, simply returns `true`.
     fn push(&mut self, item: &TraitRefExpansionInfo<'tcx>) -> bool {
         let tcx = self.visited.tcx;
 
@@ -306,27 +308,27 @@ impl<'cx, 'gcx, 'tcx> TraitRefExpander<'cx, 'gcx, 'tcx> {
             return true;
         }
 
-        // Get predicates declared on the trait.
+        // Get components of the trait alias.
         let predicates = tcx.super_predicates_of(item.trait_ref.def_id());
 
         let mut items: Vec<_> = predicates.predicates
             .iter()
             .rev()
-            .filter_map(|(pred, sp)| {
+            .filter_map(|(pred, span)| {
                 pred.subst_supertrait(tcx, &item.trait_ref)
                     .to_opt_poly_trait_ref()
                     .map(|trait_ref|
                         TraitRefExpansionInfo {
                             trait_ref,
-                            span: *sp,
+                            span: *span,
                             ..*item
                         }
                     )
             })
             .collect();
 
-        debug!("expand_trait_refs: trait_ref={:?} items={:?}",
-                item.trait_ref, items);
+        debug!("trait_ref_expander: trait_ref={:?} items={:?}",
+               item.trait_ref, items);
 
         // Only keep those items that we haven't already seen.
         items.retain(|i| self.visited.insert(&i.trait_ref.to_predicate()));
@@ -344,24 +346,17 @@ impl<'cx, 'gcx, 'tcx> Iterator for TraitRefExpander<'cx, 'gcx, 'tcx> {
     }
 
     fn next(&mut self) -> Option<TraitRefExpansionInfo<'tcx>> {
-        loop {
-            let item = self.stack.pop();
-            match item {
-                Some(item) => {
-                    if self.push(&item) {
-                        return Some(item);
-                    }
-                }
-                None => {
-                    return None;
-                }
+        while let Some(item) = self.stack.pop() {
+            if self.push(&item) {
+                return Some(item);
             }
         }
+        None
     }
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// Iterator over def-ids of supertraits
+// Iterator over def-IDs of supertraits
 ///////////////////////////////////////////////////////////////////////////
 
 pub struct SupertraitDefIds<'a, 'gcx: 'a+'tcx, 'tcx: 'a> {
diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs
index fc6edc2627b..e5410defb7a 100644
--- a/src/librustc_typeck/astconv.rs
+++ b/src/librustc_typeck/astconv.rs
@@ -981,7 +981,6 @@ impl<'o, 'gcx: 'tcx, 'tcx> dyn AstConv<'gcx, 'tcx> + 'o {
 
         let mut projection_bounds = Vec::new();
         let dummy_self = self.tcx().types.trait_object_dummy_self;
-        let mut bound_trait_refs = Vec::with_capacity(trait_bounds.len());
         let (principal, potential_assoc_types) = self.instantiate_poly_trait_ref(
             &trait_bounds[0],
             dummy_self,
@@ -989,6 +988,7 @@ impl<'o, 'gcx: 'tcx, 'tcx> dyn AstConv<'gcx, 'tcx> + 'o {
         );
         debug!("principal: {:?}", principal);
 
+        let mut bound_trait_refs = Vec::with_capacity(trait_bounds.len());
         for trait_bound in trait_bounds[1..].iter().rev() {
             // Sanity check for non-principal trait bounds.
             let (tr, _) = self.instantiate_poly_trait_ref(
@@ -1009,7 +1009,7 @@ impl<'o, 'gcx: 'tcx, 'tcx> dyn AstConv<'gcx, 'tcx> + 'o {
                 "only auto traits can be used as additional traits in a trait object");
             err.span_label(extra_trait.span, "non-auto additional trait");
             if extra_trait.span != extra_trait.top_level_span {
-                err.span_label(extra_trait.top_level_span, "expanded from this alias");
+                err.span_label(extra_trait.top_level_span, "expanded from this trait alias");
             }
             err.emit();
         }