Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Commit 0bbdabf

Browse files
authored
Merge pull request #129 from JohnTitor/real-file-name
Rustup to the latest nightly
2 parents aa4e42f + 51d313e commit 0bbdabf

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/changes.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ impl<'a> Serialize for RSpan<'a> {
8787
let hi = self.0.source_map().lookup_char_pos(self.1.hi());
8888

8989
assert!(lo.file.name == hi.file.name);
90-
let file_name = if let FileName::Real(ref p) = lo.file.name {
91-
format!("{}", p.display())
90+
let file_name = if let FileName::Real(ref name) = lo.file.name {
91+
format!("{}", name.local_path().display())
9292
} else {
9393
"no file name".to_owned()
9494
};

tests/full_cases/log-0.3.4-0.3.8.windows_msvc

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ warning: technically breaking changes in `<new::LogRecord<'a> as std::fmt::Debug
2323
|
2424
= note: trait impl generalized or newly added (technically breaking)
2525

26-
warning: technically breaking changes in `<new::LogMetadata<'a> as std::cmp::Eq>`
26+
warning: technically breaking changes in `<new::LogMetadata<'a> as std::marker::StructuralEq>`
2727
--> log-0.3.8\src\lib.rs:552:10
2828
|
2929
552 | #[derive(Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
@@ -71,7 +71,7 @@ warning: technically breaking changes in `<new::LogMetadata<'a> as std::fmt::Deb
7171
|
7272
= note: trait impl generalized or newly added (technically breaking)
7373

74-
warning: technically breaking changes in `<new::LogLocation as std::cmp::Eq>`
74+
warning: technically breaking changes in `<new::LogLocation as std::marker::StructuralEq>`
7575
--> log-0.3.8\src\lib.rs:604:30
7676
|
7777
604 | #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]

0 commit comments

Comments
 (0)