From 1557b5319a9d95421a04f2b482f6c73d9f8d786e Mon Sep 17 00:00:00 2001
From: jeb <jeb@jebrosen.com>
Date: Wed, 22 Aug 2018 16:52:17 -0600
Subject: [PATCH] Fixed build with nightly.

---
 src/bin/rust_semverver.rs | 5 +++--
 src/semcheck/mapping.rs   | 7 ++++---
 src/semcheck/traverse.rs  | 1 -
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/bin/rust_semverver.rs b/src/bin/rust_semverver.rs
index 4ffb2635..ace27b10 100644
--- a/src/bin/rust_semverver.rs
+++ b/src/bin/rust_semverver.rs
@@ -9,13 +9,14 @@ extern crate rustc;
 extern crate rustc_driver;
 extern crate rustc_errors;
 extern crate rustc_codegen_utils;
+extern crate rustc_metadata;
 extern crate semverver;
 extern crate syntax;
 
 use semverver::semcheck::run_analysis;
 
 use rustc::hir::def_id::*;
-use rustc::middle::cstore::CrateStore;
+use rustc_metadata::cstore::CStore;
 use rustc::session::{config, Session};
 use rustc::session::config::{Input, ErrorOutputType};
 
@@ -128,7 +129,7 @@ impl<'a> CompilerCalls<'a> for SemVerVerCompilerCalls {
                      trans_crate: &CodegenBackend,
                      matches: &getopts::Matches,
                      sess: &Session,
-                     cstore: &CrateStore,
+                     cstore: &CStore,
                      input: &Input,
                      odir: &Option<PathBuf>,
                      ofile: &Option<PathBuf>)
diff --git a/src/semcheck/mapping.rs b/src/semcheck/mapping.rs
index 7eb049ca..755d45ba 100644
--- a/src/semcheck/mapping.rs
+++ b/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(_, _) |
@@ -332,8 +333,8 @@ impl NameMapping {
             Local(_) |
             Upvar(_, _, _) |
             Label(_) => Some(&mut self.value_map),
-            Macro(_, _) => Some(&mut self.macro_map),
-            GlobalAsm(_) |
+            Macro(_, _) |
+            NonMacroAttr(_) => Some(&mut self.macro_map),
             Err => None,
         };
 
diff --git a/src/semcheck/traverse.rs b/src/semcheck/traverse.rs
index ed26a465..a1af382f 100644
--- a/src/semcheck/traverse.rs
+++ b/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(_)) |