Got rustc_expand and rustc_middle compiling

Author: Nicholas-Baron

src/librustc_expand/proc_macro_server.rs

@@ -610,7 +610,7 @@ impl server::SourceFile for Rustc<'_> {
         Lrc::ptr_eq(file1, file2)
     }
     fn path(&mut self, file: &Self::SourceFile) -> String {
-        match file.name {
+        match file.name.name() {
             FileName::Real(ref name) => name
                 .local_path()
                 .to_str()

src/librustc_middle/ich/impls_syntax.rs

@@ -56,8 +56,6 @@ impl<'a> HashStable<StableHashingContext<'a>> for SourceFile {
         let SourceFile {
             name: _, // We hash the smaller name_hash instead of this
             name_hash,
-            name_was_remapped,
-            unmapped_path: _,
             cnum,
             // Do not hash the source as it is not encoded
             src: _,
@@ -72,7 +70,6 @@ impl<'a> HashStable<StableHashingContext<'a>> for SourceFile {
         } = *self;
 
         (name_hash as u64).hash_stable(hcx, hasher);
-        name_was_remapped.hash_stable(hcx, hasher);
 
         src_hash.hash_stable(hcx, hasher);