---

yaml
---
r: 183482
b: refs/heads/beta
c: a25ed22
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: eec3b431aa30ab6160dcc93b7bf7f654ba9dc6ea
+refs/heads/beta: a25ed227a7887454bd1717286a7ada4f8a8d9a00
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: eb836bf767aa1d8d4cba488a9091cde3c0ab4b2f

branches/beta/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);

branches/beta/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)

branches/beta/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,