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.

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

don't build rust-analyzer-proc-macro-srv on def config #119124

Merged
merged 4 commits into from
Dec 21, 2023

Conversation

onur-ozkan
Copy link
Member

Should be very easy to understand when reviewing commit-by-commit.

Blocker for #118861

In config.toml we use `rust-analyzer-proc-macro-srv` for building `rust-analyzer-proc-macro-srv`,
however, when we attempt to build it from the terminal, this cannot be used because we need to
use the actual path, which is `proc-macro-srv-cli`. Remapping should end this confusion with
improving the development experience.

Signed-off-by: onur-ozkan <[email protected]>
@rustbot
Copy link
Collaborator

rustbot commented Dec 19, 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 Dec 19, 2023
Comment on lines -674 to +681
.default_condition(builder.config.tools.as_ref().map_or(true, |tools| {
tools
.iter()
.any(|tool| tool == "rust-analyzer" || tool == "rust-analyzer-proc-macro-srv")
}))
.default_condition(
builder.config.extended
&& builder.config.tools.as_ref().map_or(true, |tools| {
tools.iter().any(|tool| {
tool == "rust-analyzer" || tool == "rust-analyzer-proc-macro-srv"
})
}),
)
Copy link
Member Author

@onur-ozkan onur-ozkan Dec 19, 2023

Choose a reason for hiding this comment

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

I don't believe building this tool is necessary on the default configuration. Unlike rustdoc, I think this should be compiled like any other tool; either by enabling in build.tools or explicitly requesting it with x.

Copy link
Member Author

Choose a reason for hiding this comment

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

Also, this reduces the build time on x build around 15%.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 21, 2023

📌 Commit 4ba1487 has been approved by Mark-Simulacrum

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 Dec 21, 2023
@onur-ozkan
Copy link
Member Author

@bors r- (I think it's worth to make a warning with change-tracker)

@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 Dec 21, 2023
@rustbot
Copy link
Collaborator

rustbot commented Dec 21, 2023

This PR modifies config.example.toml.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 21, 2023

📌 Commit 1f141dc has been approved by Mark-Simulacrum

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 Dec 21, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 21, 2023
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#118729 (Add release notes for 1.75.0)
 - rust-lang#119124 (don't build `rust-analyzer-proc-macro-srv` on def config )
 - rust-lang#119154 (Simple modification of `non_lifetime_binders`'s diagnostic information to adapt to type binders)
 - rust-lang#119176 (Fix name error in aarch64_apple_watchos tier 3 target)
 - rust-lang#119182 (Update sysinfo version to 0.30.0)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 21, 2023
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#118729 (Add release notes for 1.75.0)
 - rust-lang#119124 (don't build `rust-analyzer-proc-macro-srv` on def config )
 - rust-lang#119154 (Simple modification of `non_lifetime_binders`'s diagnostic information to adapt to type binders)
 - rust-lang#119176 (Fix name error in aarch64_apple_watchos tier 3 target)
 - rust-lang#119182 (Update sysinfo version to 0.30.0)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c644d00 into rust-lang:master Dec 21, 2023
11 checks passed
@rustbot rustbot added this to the 1.77.0 milestone Dec 21, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 21, 2023
Rollup merge of rust-lang#119124 - onur-ozkan:help-118861, r=Mark-Simulacrum

don't build `rust-analyzer-proc-macro-srv` on def config

Should be very easy to understand when reviewing commit-by-commit.

Blocker for rust-lang#118861
@onur-ozkan onur-ozkan deleted the help-118861 branch February 17, 2024 10:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

4 participants