A few drive-by changes.

Author: alexreg

src/librustc/traits/util.rs

@@ -365,12 +365,15 @@ impl<'tcx> TraitAliasExpander<'tcx> {
 
         // Don't recurse if this trait alias is already on the stack for the DFS search.
         let anon_pred = anonymize_predicate(tcx, &pred);
-        if item.path.iter().rev().skip(1)
-                .any(|(tr, _)| anonymize_predicate(tcx, &tr.to_predicate()) == anon_pred) {
+        if item.path.iter()
+            .rev()
+            .skip(1)
+            .any(|(tr, _)| anonymize_predicate(tcx, &tr.to_predicate()) == anon_pred)
+        {
             return false;
         }
 
-        // Get components of trait alias.
+        // Get the components of this trait alias.
         let predicates = tcx.super_predicates_of(trait_ref.def_id());
 
         let items = predicates.predicates

src/librustc_typeck/astconv.rs

@@ -2,7 +2,6 @@
 //! The main routine here is `ast_ty_to_ty()`; each use is parameterized by an
 //! instance of `AstConv`.
 
-use errors::{Applicability, DiagnosticId};
 use crate::hir::{self, GenericArg, GenericArgs, ExprKind};
 use crate::hir::def::{CtorOf, Res, DefKind};
 use crate::hir::def_id::DefId;
@@ -12,32 +11,34 @@ use crate::lint;
 use crate::middle::lang_items::SizedTraitLangItem;
 use crate::middle::resolve_lifetime as rl;
 use crate::namespace::Namespace;
+use crate::require_c_abi_if_c_variadic;
+use crate::util::common::ErrorReported;
+use crate::util::nodemap::FxHashMap;
+
 use rustc::lint::builtin::AMBIGUOUS_ASSOCIATED_ITEMS;
 use rustc::traits;
 use rustc::ty::{self, DefIdTree, Ty, TyCtxt, Const, ToPredicate, TypeFoldable};
 use rustc::ty::{GenericParamDef, GenericParamDefKind};
 use rustc::ty::subst::{self, Subst, InternalSubsts, SubstsRef};
 use rustc::ty::wf::object_region_bounds;
 use rustc_target::spec::abi;
-use crate::require_c_abi_if_c_variadic;
-use smallvec::SmallVec;
+
 use syntax::ast;
 use syntax::errors::pluralize;
 use syntax::feature_gate::{GateIssue, emit_feature_err};
 use syntax::util::lev_distance::find_best_match_for_name;
 use syntax::symbol::sym;
 use syntax_pos::{DUMMY_SP, Span, MultiSpan};
-use crate::util::common::ErrorReported;
-use crate::util::nodemap::FxHashMap;
+
+use errors::{Applicability, DiagnosticId};
+use rustc_data_structures::fx::FxHashSet;
+use rustc_error_codes::*;
+use smallvec::SmallVec;
 
 use std::collections::BTreeSet;
 use std::iter;
 use std::slice;
 
-use rustc_data_structures::fx::FxHashSet;
-
-use rustc_error_codes::*;
-
 #[derive(Debug)]
 pub struct PathSeg(pub DefId, pub usize);
 
@@ -64,8 +65,7 @@ pub trait AstConv<'tcx> {
         &self,
         param: Option<&ty::GenericParamDef>,
         span: Span,
-    )
-                -> Option<ty::Region<'tcx>>;
+    ) -> Option<ty::Region<'tcx>>;
 
     /// Returns the type to use when a type is omitted.
     fn ty_infer(&self, param: Option<&ty::GenericParamDef>, span: Span) -> Ty<'tcx>;