Fixed build with nightly.

Author: jebrosen

src/semcheck/mapping.rs

@@ -321,7 +321,8 @@ impl NameMapping {
             AssociatedExistential(_) |
             PrimTy(_) |
             TyParam(_) |
-            SelfTy(_, _) => Some(&mut self.type_map),
+            SelfTy(_, _) |
+            ToolMod => Some(&mut self.type_map),
             Fn(_) |
             Const(_) |
             Static(_, _) |
@@ -333,9 +334,7 @@ impl NameMapping {
             Upvar(_, _, _) |
             Label(_) => Some(&mut self.value_map),
             Macro(_, _) => Some(&mut self.macro_map),
-            ToolMod |
-            NonMacroAttr /*(_)*/ |
-            GlobalAsm(_) |
+            NonMacroAttr(_) |
             Err => None,
         };
 

src/semcheck/traverse.rs

@@ -174,7 +174,6 @@ fn diff_structure<'a, 'tcx>(changes: &mut ChangeSet,
                             (Local(_), Local(_)) |
                             (Upvar(_, _, _), Upvar(_, _, _)) |
                             (Label(_), Label(_)) |
-                            (GlobalAsm(_), GlobalAsm(_)) |
                             (Macro(_, _), Macro(_, _)) |
                             (Variant(_), Variant(_)) |
                             (Const(_), Const(_)) |