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

Rustup to the latest nightly #129

Merged
merged 2 commits into from
Jun 2, 2020
Merged

Rustup to the latest nightly #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
773b25a
Rustup to the latest nightly
JohnTitor Jun 2, 2020
51d313e
Update test
JohnTitor Jun 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/changes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
};
Expand Down
4 changes: 2 additions & 2 deletions tests/full_cases/log-0.3.4-0.3.8.windows_msvc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down Expand Up @@ -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)]
Expand Down