deps: apply upstream rustc-* changes

[rust.git] / src / config / file_lines.rs

diff --git a/src/config/file_lines.rs b/src/config/file_lines.rs
index f0dc6c66597033b7a0a6fb8b03729668beee9e5f..95fc4adec8dc8ff7b8d5a22e15f5b0c3a3714cca 100644 (file)
--- a/src/config/file_lines.rs
+++ b/src/config/file_lines.rs
@@ -6,11 +6,10 @@
 use std::rc::Rc;
 use std::{cmp, fmt, iter, str};
 
+use rustc_span::{self, SourceFile};
 use serde::{ser, Deserialize, Deserializer, Serialize, Serializer};
 use serde_json as json;
 
-use syntax::source_map::{self, SourceFile};
-
 /// A range of lines in a file, inclusive of both ends.
 pub struct LineRange {
     pub file: Rc<SourceFile>,
@@ -25,11 +24,11 @@ pub enum FileName {
     Stdin,
 }
 
-impl From<source_map::FileName> for FileName {
-    fn from(name: source_map::FileName) -> FileName {
+impl From<rustc_span::FileName> for FileName {
+    fn from(name: rustc_span::FileName) -> FileName {
         match name {
-            source_map::FileName::Real(p) => FileName::Real(p),
-            source_map::FileName::Custom(ref f) if f == "stdin" => FileName::Stdin,
+            rustc_span::FileName::Real(p) => FileName::Real(p.into_local_path()),
+            rustc_span::FileName::Custom(ref f) if f == "stdin" => FileName::Stdin,
             _ => unreachable!(),
         }
     }