WIP -- Pacify the mercilous tidy.

Author: nikomatsakis

src/librustc/middle/traits/fulfill.rs

@@ -361,9 +361,6 @@ fn process_predicate<'a,'tcx>(selcx: &mut SelectionContext<'a,'tcx>,
             // regions.  If there are, we will call this obligation an
             // error. Eventually we should be able to support some
             // cases here, I imagine (e.g., `for<'a> &'a int : 'a`).
-            //
-            // TODO This is overly conservative, but good enough for
-            // now.
             if ty::count_late_bound_regions(selcx.tcx(), binder) != 0 {
                 errors.push(
                     FulfillmentError::new(

src/librustc/middle/ty.rs

@@ -1308,7 +1308,7 @@ pub enum sty<'tcx> {
 #[deriving(Clone, PartialEq, Eq, Hash, Show)]
 pub struct TyTrait<'tcx> {
     // Principal trait reference.
-    pub principal: PolyTraitRef<'tcx>, // would use Rc<TraitRef>, but it runs afoul of some static rules
+    pub principal: PolyTraitRef<'tcx>,
     pub bounds: ExistentialBounds
 }
 
@@ -1317,7 +1317,9 @@ impl<'tcx> TyTrait<'tcx> {
     /// we convert the principal trait-ref into a normal trait-ref,
     /// you must give *some* self-type. A common choice is `mk_err()`
     /// or some skolemized type.
-    pub fn principal_trait_ref_with_self_ty(&self, self_ty: Ty<'tcx>) -> Rc<ty::PolyTraitRef<'tcx>> {
+    pub fn principal_trait_ref_with_self_ty(&self, self_ty: Ty<'tcx>)
+                                            -> Rc<ty::PolyTraitRef<'tcx>>
+    {
         Rc::new(ty::Binder(ty::TraitRef {
             def_id: self.principal.def_id(),
             substs: self.principal.substs().with_self_ty(self_ty),

src/librustc_typeck/astconv.rs

@@ -524,7 +524,8 @@ pub fn instantiate_poly_trait_ref<'tcx,AC,RS>(
     -> Rc<ty::PolyTraitRef<'tcx>>
     where AC: AstConv<'tcx>, RS: RegionScope
 {
-    let trait_ref = instantiate_trait_ref(this, rscope, &ast_trait_ref.trait_ref, self_ty, allow_eq);
+    let trait_ref =
+        instantiate_trait_ref(this, rscope, &ast_trait_ref.trait_ref, self_ty, allow_eq);
     let trait_ref = (*trait_ref).clone();
     Rc::new(ty::Binder(trait_ref)) // Ugh.
 }