Merge pull request rust-lang#129 from JohnTitor/real-file-name

Rustup to the latest nightly
eddyb · Jun 2, 2020 · 0bbdabf · 0bbdabf
2 parents aa4e42f + 51d313e
commit 0bbdabf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/changes.rs b/src/changes.rs
@@ -87,8 +87,8 @@ impl<'a> Serialize for RSpan<'a> {
         let hi = self.0.source_map().lookup_char_pos(self.1.hi());
 
         assert!(lo.file.name == hi.file.name);
-        let file_name = if let FileName::Real(ref p) = lo.file.name {
-            format!("{}", p.display())
+        let file_name = if let FileName::Real(ref name) = lo.file.name {
+            format!("{}", name.local_path().display())
         } else {
             "no file name".to_owned()
         };

diff --git a/tests/full_cases/log-0.3.4-0.3.8.windows_msvc b/tests/full_cases/log-0.3.4-0.3.8.windows_msvc
@@ -23,7 +23,7 @@ warning: technically breaking changes in `<new::LogRecord<'a> as std::fmt::Debug
     |
     = note: trait impl generalized or newly added (technically breaking)
 
-warning: technically breaking changes in `<new::LogMetadata<'a> as std::cmp::Eq>`
+warning: technically breaking changes in `<new::LogMetadata<'a> as std::marker::StructuralEq>`
    --> log-0.3.8\src\lib.rs:552:10
     |
 552 | #[derive(Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
@@ -71,7 +71,7 @@ warning: technically breaking changes in `<new::LogMetadata<'a> as std::fmt::Deb
     |
     = note: trait impl generalized or newly added (technically breaking)
 
-warning: technically breaking changes in `<new::LogLocation as std::cmp::Eq>`
+warning: technically breaking changes in `<new::LogLocation as std::marker::StructuralEq>`
    --> log-0.3.8\src\lib.rs:604:30
     |
 604 | #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]