Fix for normalized_call_site on nightly #3860
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previous fix replaced call to site.source_file() by site.file(), but the latter returns a (displayable) String rather than something that has a path(), causing compile time errors on nightly. This fix uses local_file() (Option<PathBuf>) and span_to_stable_id() if possible, and file() (String) and format! otherwise (which may or may not be actually stable)
.replace(['/', '\\'], "-")
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The previous fix (#3859) from two days ago replaced the call to
site.source_file()bysite.file(), but the latter returns a (displayable)Stringrather than something that has apath(), causing compile time errors on nightly.There are two options that I see:
site.local_file()returns anOption<PathBuf>that needs dealing with before we can defer tospan_to_stable_id()as before.site.file()and generate an ID analogous tospan_to_stable_id()- notably though, theStringreturned bysite.file()may or may not be stable (e.g. according to the docs, it could return something like"<macro expansion>").This PR therefore prefers 1. when
local_file().is_some()and uses 2. otherwise, in the interest of returningSomeif at all possible.