Skip to content
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

Fix rust-analyzer proc macro server #112339

Merged
merged 1 commit into from
Jun 8, 2023
Merged

Fix rust-analyzer proc macro server #112339

merged 1 commit into from
Jun 8, 2023

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Jun 6, 2023

The feature now exists on proc-macro-srv-cli, and without it the proc macro server will bail rigth out.

CC rust-lang/rust-analyzer#14991

@rustbot
Copy link
Collaborator

rustbot commented Jun 6, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 6, 2023
@lnicola
Copy link
Member Author

lnicola commented Jun 6, 2023

CC @Veykril

@lnicola
Copy link
Member Author

lnicola commented Jun 6, 2023

I was able to reproduce the issue in a local build, and this change fixed it, but take it with a grain of salt.

@Veykril
Copy link
Member

Veykril commented Jun 6, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Jun 6, 2023

📌 Commit a3cc503 has been approved by Veykril

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 6, 2023
@HTGAzureX1212 HTGAzureX1212 mentioned this pull request Jun 7, 2023
Closed
@lnicola
Copy link
Member Author

lnicola commented Jun 8, 2023

@Veykril next time please use bors rollup 😅.

@Veykril
Copy link
Member

Veykril commented Jun 8, 2023

I've got no idea how bors and rollups work here sorry 😅

@Veykril
Copy link
Member

Veykril commented Jun 8, 2023

I guess we can turn it into a rollup PR so it gets collected next time?
@bors r-
@bors r+ rollup

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 8, 2023
@bors
Copy link
Contributor

bors commented Jun 8, 2023

📌 Commit a3cc503 has been approved by Veykril

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 8, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Jun 8, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 8, 2023
@bors
Auto merge of rust-lang#112420 - matthiaskrgr:rollup-spiavw5, r=matth…
a77659a 
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#109953 (Use 128 bits for TypeId hash)
 - rust-lang#112333 (Don't hold the active queries lock while calling `make_query`)
 - rust-lang#112339 (Fix rust-analyzer proc macro server)
 - rust-lang#112410 (Do `fix_*_builtin_expr` hacks on the writeback results)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c71daaa into rust-lang:master Jun 8, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 8, 2023
@lnicola lnicola deleted the proc-macro-srv-feature branch June 8, 2023 19:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Veykril Veykril Veykril approved these changes

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.72.0
Development

Successfully merging this pull request may close these issues.
5 participants
@lnicola @rustbot @Veykril @bors @Mark-Simulacrum