File tree 2 files changed +8
-8
lines changed
2 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -152,16 +152,18 @@ enum vtable_origin {
152
152
153
153
type vtable_map = hashmap < ast:: node_id , vtable_res > ;
154
154
155
- type ty_param_substs_and_ty = { substs : ty:: substs , ty: ty:: t } ;
156
155
// Stores information about provided methods, aka "default methods" in traits.
157
156
// Maps from a trait's def_id to a MethodInfo about
158
157
// that method in that trait.
159
158
type provided_methods_map = hashmap < ast:: node_id ,
160
159
~[ @resolve3:: MethodInfo ] > ;
161
160
162
- type ty_table = hashmap < ast :: def_id , ty:: t > ;
161
+ type ty_param_substs_and_ty = { substs : ty :: substs , ty: ty :: t } ;
163
162
164
163
type crate_ctxt_ = { impl_map : resolve3:: ImplMap ,
164
+
165
+ // A mapping from method call sites to traits that have
166
+ // that method.
165
167
trait_map : resolve3:: TraitMap ,
166
168
method_map : method_map ,
167
169
vtable_map : vtable_map ,
Original file line number Diff line number Diff line change @@ -257,7 +257,6 @@ class CoherenceChecker {
257
257
// Bring in external crates. It's fine for this to happen after the
258
258
// coherence checks, because we ensure by construction that no errors
259
259
// can happen at link time.
260
-
261
260
self . add_external_crates ( ) ;
262
261
}
263
262
@@ -273,8 +272,8 @@ class CoherenceChecker {
273
272
* item. ident} ;
274
273
275
274
match get_base_type_def_id ( self . inference_context ,
276
- item. span ,
277
- self_type. ty ) {
275
+ item. span ,
276
+ self_type. ty ) {
278
277
none => {
279
278
let session = self . crate_context . tcx . sess ;
280
279
session. span_err ( item. span ,
@@ -421,7 +420,6 @@ class CoherenceChecker {
421
420
}
422
421
423
422
// Privileged scope checking
424
-
425
423
fn check_privileged_scopes( crate : @crate ) {
426
424
// Gather up all privileged types.
427
425
let privileged_types =
@@ -717,8 +715,8 @@ class CoherenceChecker {
717
715
718
716
if associated_traits. len ( ) == 0 {
719
717
match get_base_type_def_id ( self . inference_context ,
720
- dummy_sp ( ) ,
721
- self_type. ty ) {
718
+ dummy_sp ( ) ,
719
+ self_type. ty ) {
722
720
none => {
723
721
let session = self . crate_context . tcx . sess ;
724
722
session. bug ( fmt ! { "no base type for external impl \
You can’t perform that action at this time.
0 commit comments