Skip to content
This repository has been archived by the owner on Dec 29, 2022. It is now read-only.

Sync with rustc_span changes #1736

Merged
merged 2 commits into from
May 15, 2021
Merged

Sync with rustc_span changes #1736

merged 2 commits into from
May 15, 2021

Conversation

cbeuw
Copy link
Contributor

@cbeuw cbeuw commented May 12, 2021

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

@cbeuw cbeuw changed the title [Don't merge yet] Sync with rustc_span changes Sync with rustc_span changes May 13, 2021
@cbeuw cbeuw marked this pull request as ready for review May 13, 2021 07:51
@Xanewok
Copy link
Member

Xanewok commented May 15, 2021

Thanks a lot!

@bors r+

@bors
Copy link
Contributor

bors commented May 15, 2021

📌 Commit 9fae699 has been approved by Xanewok

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
@bors
Copy link
Contributor

bors commented May 15, 2021

⌛ Testing commit 9fae699 with merge 074c8f5...

@Xanewok
Copy link
Member

Xanewok commented May 15, 2021

memory allocation of 16777216 bytes failed

Looks spurious in the WIndows runner, let's retry that
@bors r-

@Xanewok
Copy link
Member

Xanewok commented May 15, 2021

@bors r+

@bors
Copy link
Contributor

bors commented May 15, 2021

📌 Commit 9fae699 has been approved by Xanewok

@bors
Copy link
Contributor

bors commented May 15, 2021

⌛ Testing commit 9fae699 with merge 097d890...

@bors
Copy link
Contributor

bors commented May 15, 2021

☀️ Test successful - checks-actions
Approved by: Xanewok
Pushing 097d890 to master...

@bors bors merged commit 097d890 into rust-lang:master May 15, 2021
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.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants