diff --git a/src/librustc/metadata/csearch.rs b/src/librustc/metadata/csearch.rs
index 245b9ef66ad3..7eeb0589118f 100644
--- a/src/librustc/metadata/csearch.rs
+++ b/src/librustc/metadata/csearch.rs
@@ -234,7 +234,7 @@ pub fn get_trait_def<'tcx>(tcx: &ty::ctxt<'tcx>, def: ast::DefId) -> ty::TraitDe
 }
 
 pub fn get_predicates<'tcx>(tcx: &ty::ctxt<'tcx>, def: ast::DefId)
-                                  -> ty::GenericPredicates<'tcx>
+                            -> ty::GenericPredicates<'tcx>
 {
     let cstore = &tcx.sess.cstore;
     let cdata = cstore.get_crate_data(def.krate);
diff --git a/src/librustc/metadata/decoder.rs b/src/librustc/metadata/decoder.rs
index 4924ebc57674..e5576de6e842 100644
--- a/src/librustc/metadata/decoder.rs
+++ b/src/librustc/metadata/decoder.rs
@@ -418,9 +418,9 @@ pub fn get_trait_def<'tcx>(cdata: Cmd,
 }
 
 pub fn get_predicates<'tcx>(cdata: Cmd,
-                                  item_id: ast::NodeId,
-                                  tcx: &ty::ctxt<'tcx>)
-                                  -> ty::GenericPredicates<'tcx>
+                            item_id: ast::NodeId,
+                            tcx: &ty::ctxt<'tcx>)
+                            -> ty::GenericPredicates<'tcx>
 {
     let item_doc = lookup_item(item_id, cdata.data());
     doc_predicates(item_doc, tcx, cdata, tag_item_generics)
diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs
index 3ee3eb87b95a..8a1945c16a6a 100644
--- a/src/librustc_typeck/collect.rs
+++ b/src/librustc_typeck/collect.rs
@@ -44,7 +44,7 @@ Converting types can require:
 
 So as you can see, in general translating types requires knowing the
 trait hierarchy. But this gets a bit tricky because translating the
-trait hierarchy requires convering the types that appear in trait
+trait hierarchy requires converting the types that appear in trait
 references. One potential saving grace is that in general knowing the
 trait hierarchy is only necessary for shorthands like `T::X` or
 handling omitted lifetime bounds on object types. Therefore, if we are
@@ -1778,12 +1778,12 @@ fn check_method_self_type<'a, 'tcx, RS:RegionScope>(
                 &ty::liberate_late_bound_regions(
                     tcx, body_scope, &ty::Binder(base_type)));
 
-        //debug!("required_type={} required_type_free={} \
-                //base_type={} base_type_free={}",
-               //required_type.repr(tcx),
-               //required_type_free.repr(tcx),
-               //base_type.repr(tcx),
-               //base_type_free.repr(tcx));
+        debug!("required_type={} required_type_free={} \
+                base_type={} base_type_free={}",
+               required_type.repr(tcx),
+               required_type_free.repr(tcx),
+               base_type.repr(tcx),
+               base_type_free.repr(tcx));
 
         let infcx = infer::new_infer_ctxt(tcx);
         drop(::require_same_types(tcx,