Skip to content

Find standalone proc-macro-srv on windows too #12878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jul 26, 2022
Merged

Find standalone proc-macro-srv on windows too #12878

merged 1 commit into from
Jul 26, 2022

Conversation

fasterthanlime
Copy link
Contributor

I forgot that executables end with .exe on Windows in:

@fasterthanlime
Copy link
Contributor Author

fasterthanlime commented Jul 26, 2022 •
edited
Loading

I tested this on Windows, works fine:

[INFO rust_analyzer::reload] Found a cargo workspace...
[INFO rust_analyzer::reload] Found a cargo workspace with a sysroot...
[INFO rust_analyzer::reload] And the server exists at C:\Users\amos\.rustup\toolchains\nightly-2022-07-23-x86_64-pc-windows-msvc\libexec\rust-analyzer-proc-macro-srv.exe
[INFO rust_analyzer::reload] Using proc-macro server at C:\Users\amos\.rustup\toolchains\nightly-2022-07-23-x86_64-pc-windows-msvc\libexec\rust-analyzer-proc-macro-srv.exe with args []

I also verified that it still works on Linux:

[INFO rust_analyzer::reload] Found a cargo workspace...
[INFO rust_analyzer::reload] Found a cargo workspace with a sysroot...
[INFO rust_analyzer::reload] And the server exists at /home/amos/.rustup/toolchains/nightly-2022-07-23-x86_64-unknown-linux-gnu/libexec/rust-analyzer-proc-macro-srv
[INFO rust_analyzer::reload] Using proc-macro server at /home/amos/.rustup/toolchains/nightly-2022-07-23-x86_64-unknown-linux-gnu/libexec/rust-analyzer-proc-macro-srv with args []

@fasterthanlime fasterthanlime marked this pull request as ready for review July 26, 2022 09:34
lnicola
lnicola reviewed Jul 26, 2022
View reviewed changes
crates/rust-analyzer/src/reload.rs Outdated
let standalone_server_name = "rust-analyzer-proc-macro-srv";

#[cfg(windows)]
let standalone_server_name = "rust-analyzer-proc-macro-srv.exe";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you seen https://doc.rust-lang.org/std/env/consts/constant.EXE_SUFFIX.html?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks neat! I'm stealing that.

@lnicola
Copy link
Member

lnicola commented Jul 26, 2022

We generally use git rebase to clean up PRs, but it's fine if you don't feel like it.

@bors delegate+

@bors
Copy link
Contributor

bors commented Jul 26, 2022

✌️ @fasterthanlime can now approve this pull request

@fasterthanlime
Copy link
Contributor Author

@lnicola since you delegated, should I use the "+" syntax or the "=lnicola" syntax for bors?

@lnicola
Copy link
Member

lnicola commented Jul 26, 2022 •
edited
Loading

Whichever you prefer, we aren't too strict on the process and nobody is keeping track :-). I personally try to use r=, but I'm sure I've forgotten to at times.

@bors r+

@bors
Copy link
Contributor

bors commented Jul 26, 2022

📌 Commit b1e3daf has been approved by lnicola

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jul 26, 2022

⌛ Testing commit b1e3daf with merge 1c75284...

@bors
Copy link
Contributor

bors commented Jul 26, 2022

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 1c75284 to master...

@bors bors merged commit 1c75284 into rust-lang:master Jul 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lnicola lnicola lnicola left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fasterthanlime @lnicola @bors