Got rustc_metadata compiling.

Author: Nicholas-Baron

src/librustc_metadata/rmeta/decoder.rs

@@ -1635,7 +1635,6 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
                     // containing the information we need.
                     let rustc_span::SourceFile {
                         mut name,
-                        name_was_remapped,
                         src_hash,
                         start_pos,
                         end_pos,
@@ -1652,7 +1651,7 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
                     // on `try_to_translate_virtual_to_real`).
                     // FIXME(eddyb) we could check `name_was_remapped` here,
                     // but in practice it seems to be always `false`.
-                    try_to_translate_virtual_to_real(&mut name);
+                    try_to_translate_virtual_to_real(name.name_mut());
 
                     let source_length = (end_pos - start_pos).to_usize();
 
@@ -1675,8 +1674,8 @@ impl<'a, 'tcx> CrateMetadataRef<'a> {
                     }
 
                     let local_version = sess.source_map().new_imported_source_file(
-                        name,
-                        name_was_remapped,
+                        name.name().clone(),
+                        name.was_remapped(),
                         src_hash,
                         name_hash,
                         source_length,

src/librustc_metadata/rmeta/encoder.rs

@@ -445,11 +445,11 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
                 (!source_file.is_imported() || self.is_proc_macro)
             })
             .map(|(_, source_file)| {
-                let mut adapted = match source_file.name {
+                let mut adapted = match source_file.name.name() {
                     // This path of this SourceFile has been modified by
                     // path-remapping, so we use it verbatim (and avoid
                     // cloning the whole map in the process).
-                    _ if source_file.name_was_remapped => source_file.clone(),
+                    _ if source_file.name.was_remapped() => source_file.clone(),
 
                     // Otherwise expand all paths to absolute paths because
                     // any relative paths are potentially relative to a
@@ -460,7 +460,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
                         adapted.name = Path::new(&working_dir).join(name).into();
                         adapted.name_hash = {
                             let mut hasher: StableHasher = StableHasher::new();
-                            adapted.name.hash(&mut hasher);
+                            adapted.name.name().hash(&mut hasher);
                             hasher.finish::<u128>()
                         };
                         Lrc::new(adapted)

src/librustc_span/lib.rs

@@ -1096,6 +1096,10 @@ impl SourceFileName {
         &self.name
     }
 
+    pub fn name_mut(&mut self) -> &mut FileName {
+        &mut self.name
+    }
+
     pub fn unmapped_path(&self) -> &FileName {
         self.unmapped_name.as_ref().unwrap_or(self.name())
     }
@@ -1109,6 +1113,14 @@ impl SourceFileName {
     }
 }
 
+/// This conversion assumes that the path was not remapped (ie name == unmapped_name)
+impl From<PathBuf> for SourceFileName {
+    fn from(path: PathBuf) -> Self {
+        let name: FileName = path.into();
+        Self::new(name.clone(), false, Some(name))
+    }
+}
+
 impl Encodable for SourceFileName {
     fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
         s.emit_struct("SourceFileName", 3, |s| {