Teach typeck about `auto trait`

2 files changed, 7 insertions, 4 deletions

diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs
index 7214904887e..a69d41d1603 100644
--- a/src/librustc/hir/lowering.rs
+++ b/src/librustc/hir/lowering.rs
@@ -1742,8 +1742,8 @@ impl<'a> LoweringContext<'a> {
         }
     }
 
-    fn lower_is_auto(&mut self, u: IsAuto) -> hir::IsAuto {
-        match u {
+    fn lower_is_auto(&mut self, a: IsAuto) -> hir::IsAuto {
+        match a {
             IsAuto::Yes => hir::IsAuto::Yes,
             IsAuto::No => hir::IsAuto::No,
         }
diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs
index 72b40d87708..81447097428 100644
--- a/src/librustc_typeck/collect.rs
+++ b/src/librustc_typeck/collect.rs
@@ -730,11 +730,14 @@ fn trait_def<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
     }
 
     let def_path_hash = tcx.def_path_hash(def_id);
-    let has_auto_impl = tcx.hir.trait_is_auto(def_id);
+    let is_auto = match item.node {
+        hir::ItemTrait(hir::IsAuto::Yes, ..) => true,
+        _ => tcx.hir.trait_is_auto(def_id),
+    };
     let def = ty::TraitDef::new(def_id,
                                 unsafety,
                                 paren_sugar,
-                                has_auto_impl,
+                                is_auto,
                                 def_path_hash);
     tcx.alloc_trait_def(def)
 }