---

yaml
---
r: 23085
b: refs/heads/master
c: edf1d0c
h: refs/heads/master
i:
  23083: 10629c1
v: v3

Author: lkuper

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 293f371477dc2cd63c3ba12235f4d294e89dca5a
+refs/heads/master: edf1d0c245e7ba4eed4be89101073d8515a0f129
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/typeck.rs

@@ -152,16 +152,18 @@ enum vtable_origin {
 
 type vtable_map = hashmap<ast::node_id, vtable_res>;
 
-type ty_param_substs_and_ty = {substs: ty::substs, ty: ty::t};
 // Stores information about provided methods, aka "default methods" in traits.
 // Maps from a trait's def_id to a MethodInfo about
 // that method in that trait.
 type provided_methods_map = hashmap<ast::node_id,
                                     ~[@resolve3::MethodInfo]>;
 
-type ty_table = hashmap<ast::def_id, ty::t>;
+type ty_param_substs_and_ty = {substs: ty::substs, ty: ty::t};
 
 type crate_ctxt_ = {impl_map: resolve3::ImplMap,
+
+                    // A mapping from method call sites to traits that have
+                    // that method.
                     trait_map: resolve3::TraitMap,
                     method_map: method_map,
                     vtable_map: vtable_map,

trunk/src/rustc/middle/typeck/coherence.rs

@@ -257,7 +257,6 @@ class CoherenceChecker {
         // Bring in external crates. It's fine for this to happen after the
         // coherence checks, because we ensure by construction that no errors
         // can happen at link time.
-
         self.add_external_crates();
     }
 
@@ -273,8 +272,8 @@ class CoherenceChecker {
                    *item.ident};
 
             match get_base_type_def_id(self.inference_context,
-                                     item.span,
-                                     self_type.ty) {
+                                       item.span,
+                                       self_type.ty) {
                 none => {
                     let session = self.crate_context.tcx.sess;
                     session.span_err(item.span,
@@ -421,7 +420,6 @@ class CoherenceChecker {
     }
 
     // Privileged scope checking
-
     fn check_privileged_scopes(crate: @crate) {
         // Gather up all privileged types.
         let privileged_types =
@@ -717,8 +715,8 @@ class CoherenceChecker {
 
             if associated_traits.len() == 0 {
                 match get_base_type_def_id(self.inference_context,
-                                         dummy_sp(),
-                                         self_type.ty) {
+                                           dummy_sp(),
+                                           self_type.ty) {
                     none => {
                         let session = self.crate_context.tcx.sess;
                         session.bug(fmt!{"no base type for external impl \