---

yaml
---
r: 40265
b: refs/heads/dist-snap
c: abab49b
h: refs/heads/master
i:
  40263: 4d0168a
v: v3

Author: pcwalton

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 94f05c1936e85d4805e7177fe546d4c6f40340d8
+refs/heads/dist-snap: abab49b7cf65b787a2635332d9c867795d4dafc5
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/rustc/middle/typeck/check/vtable.rs

@@ -100,9 +100,9 @@ fn lookup_vtable_covariant(fcx: @fn_ctxt,
                            allow_unsafe: bool,
                            is_early: bool)
                         -> Option<vtable_origin> {
-	debug!("lookup_vtable_covariant(ty: %s, trait_ty=%s)",
-		   fcx.infcx().ty_to_str(ty),
-		   fcx.infcx().ty_to_str(trait_ty));
+    debug!("lookup_vtable_covariant(ty: %s, trait_ty=%s)",
+           fcx.infcx().ty_to_str(ty),
+           fcx.infcx().ty_to_str(trait_ty));
 
     let worklist = dvec::DVec();
     worklist.push(trait_ty);
@@ -479,16 +479,16 @@ fn early_resolve_expr(ex: @ast::expr, &&fcx: @fn_ctxt, is_early: bool) {
       ast::expr_path(*) => {
         match fcx.opt_node_ty_substs(ex.id) {
           Some(ref substs) => {
-		  	let def = cx.tcx.def_map.get(ex.id);
+              let def = cx.tcx.def_map.get(ex.id);
             let did = ast_util::def_id_of_def(def);
-			debug!("early resolve expr: def %?", def);
+            debug!("early resolve expr: def %?", def);
             let item_ty = ty::lookup_item_type(cx.tcx, did);
             if has_trait_bounds(*item_ty.bounds) {
-				for item_ty.bounds.each |bounds| {
-					debug!("early_resolve_expr: looking up vtables for bound \
-							%s",
-						   ty::param_bounds_to_str(fcx.tcx(), *bounds));
-				}
+                for item_ty.bounds.each |bounds| {
+                    debug!("early_resolve_expr: looking up vtables for bound \
+                            %s",
+                           ty::param_bounds_to_str(fcx.tcx(), *bounds));
+                }
                 let vtbls = lookup_vtables(fcx, ex, item_ty.bounds,
                                            substs, false, is_early);
                 if !is_early { cx.vtable_map.insert(ex.id, vtbls); }

branches/dist-snap/src/rustc/middle/typeck/collect.rs

@@ -231,11 +231,11 @@ fn ensure_trait_methods(ccx: @crate_ctxt, id: ast::node_id, trait_ty: ty::t) {
             let trait_bounds = ty_param_bounds(ccx, params);
             let ty_m = trait_method_to_ty_method(*m);
             let method_ty = ty_of_ty_method(ccx, ty_m, region_paramd, def_id);
-			if ty_m.self_ty.node == ast::sty_static {
-				make_static_method_ty(ccx, ty_m, region_paramd,
-									  method_ty, trait_ty,
-									  trait_bounds);
-			}
+            if ty_m.self_ty.node == ast::sty_static {
+                make_static_method_ty(ccx, ty_m, region_paramd,
+                                      method_ty, trait_ty,
+                                      trait_bounds);
+            }
             method_ty
         });
       }
@@ -423,21 +423,21 @@ fn check_methods_against_trait(ccx: @crate_ctxt,
     let (did, tpt) = instantiate_trait_ref(ccx, a_trait_ty, rp);
 
     if did.crate == ast::local_crate {
-		// NB: This is subtle. We need to do this on the type of the trait
-		// item *itself*, not on the type that includes the parameter
-		// substitutions provided by the programmer at this particular
-		// trait ref. Otherwise, we will potentially overwrite the types of
-		// the methods within the trait with bogus results. (See issue #3903.)
-
-		match tcx.items.find(did.node) {
-			Some(ast_map::node_item(item, _)) => {
-				let tpt = ty_of_item(ccx, item);
-				ensure_trait_methods(ccx, did.node, tpt.ty);
-			}
-			_ => {
-				tcx.sess.bug(~"trait ref didn't resolve to trait");
-			}
-		}
+        // NB: This is subtle. We need to do this on the type of the trait
+        // item *itself*, not on the type that includes the parameter
+        // substitutions provided by the programmer at this particular
+        // trait ref. Otherwise, we will potentially overwrite the types of
+        // the methods within the trait with bogus results. (See issue #3903.)
+
+        match tcx.items.find(did.node) {
+            Some(ast_map::node_item(item, _)) => {
+                let tpt = ty_of_item(ccx, item);
+                ensure_trait_methods(ccx, did.node, tpt.ty);
+            }
+            _ => {
+                tcx.sess.bug(~"trait ref didn't resolve to trait");
+            }
+        }
     }
 
     for vec::each(*ty::trait_methods(tcx, did)) |trait_m| {