---

yaml
---
r: 22449
b: refs/heads/master
c: 9b7d9a9
h: refs/heads/master
i:
  22447: f9bf538
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: fdf0c1b353393ff34b1dee6edfbfece13f7c3093
+refs/heads/master: 9b7d9a9a1bcfba81979f6f1165b5274c93b03039
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

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

@@ -166,16 +166,15 @@ class CoherenceChecker {
                 self.get_base_type(base_mutability_and_type.ty)
             }
 
-            ty_enum(*) | ty_class(*) {
+            ty_enum(*) | ty_trait(*) | ty_class(*) {
                 some(original_type)
             }
 
             ty_nil | ty_bot | ty_bool | ty_int(*) | ty_uint(*) | ty_float(*) |
             ty_str | ty_estr(*) | ty_vec(*) | ty_evec(*) | ty_rec(*) |
-            ty_fn(*) | ty_trait(*) | ty_tup(*) | ty_var(*) |
-            ty_var_integral(*) | ty_param(*) | ty_self | ty_constr(*) |
-            ty_type | ty_opaque_box | ty_opaque_closure_ptr(*) |
-            ty_unboxed_vec(*) {
+            ty_fn(*) | ty_tup(*) | ty_var(*) | ty_var_integral(*) |
+            ty_param(*) | ty_self | ty_constr(*) | ty_type | ty_opaque_box |
+            ty_opaque_closure_ptr(*) | ty_unboxed_vec(*) {
                 none
             }
         }
@@ -189,12 +188,14 @@ class CoherenceChecker {
             }
             some(base_type) {
                 alt get(base_type).struct {
-                    ty_enum(def_id, _) | ty_class(def_id, _) {
+                    ty_enum(def_id, _) |
+                    ty_class(def_id, _) |
+                    ty_trait(def_id, _) {
                         ret some(def_id);
                     }
                     _ {
                         fail "get_base_type() returned a type that wasn't an \
-                              enum or class";
+                              enum, class, or trait";
                     }
                 }
             }
@@ -394,13 +395,13 @@ class CoherenceChecker {
         let results = @dvec();
         for items.each |item| {
             alt item.node {
-                item_class(*) | item_enum(*) {
+                item_class(*) | item_enum(*) | item_trait(*) {
                     results.push(local_def(item.id));
                 }
 
                 item_const(*) | item_fn(*) | item_mod(*) |
-                item_foreign_mod(*) | item_ty(*) | item_trait(*) |
-                item_impl(*) | item_mac(*) {
+                item_foreign_mod(*) | item_ty(*) | item_impl(*) |
+                item_mac(*) {
                     // Nothing to do.
                 }
             }