This repository has been archived by the owner on Dec 29, 2022. It is now read-only.
Sync with rustc_span changes #1736
Merged
Conversation
This file contains 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
cbeuw
changed the title
|
Thanks a lot! @bors r+ |
|
📌 Commit 9fae699 has been approved by |
bors
added a commit
that referenced
this pull request
May 15, 2021
Sync with rustc_span changes rust-lang/rust#83813 made some changes to SourceMap and RealFileName. Now to get a string from a `rustc_span::FileName` or `RealFileName` (`working_dir` in `rustc_span::Session` is now a `RealFileName` because it may be remapped), we need to specify if we would like the local filesystem path or remapped path via `--remap-path-prefix`. There are two files affected, the context very similar in both. I'm not entirely sure if we want the local path or remapped path here, so I just picked local path as a placeholder for opening this PR. Closes - after updating rls module in rustc repo - rust-lang/rust#85225
Looks spurious in the WIndows runner, let's retry that |
|
@bors r+ |
|
📌 Commit 9fae699 has been approved by |
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 17, 2021
Update RLS Contains rust-lang/rls#1736. With rust-lang#82208 merged, this should now close rust-lang#85225. Tested locally with `./x.py test src/tools/rls` and seems to be working as expected. I noticed the rustfmt merge didn't trigger toolstate upgrade (because we pruned most but not all of the related machinery?), so I'd rather get this rubber-stamped by someone more knowledgeable with infra/the merged changes in case I missed something and need to include something else here to unbreak the RLS toolstate. r? `@Mark-Simulacrum`
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
rust-lang/rust#83813 made some changes to SourceMap and RealFileName. Now to get a string from a
rustc_span::FileNameorRealFileName(working_dirinrustc_span::Sessionis now aRealFileNamebecause it may be remapped), we need to specify if we would like the local filesystem path or remapped path via--remap-path-prefix.There are two files affected, the context very similar in both. I'm not entirely sure if we want the local path or remapped path here, so I just picked local path as a placeholder for opening this PR.
Closes - after updating rls module in rustc repo - rust-lang/rust#85225