don't build rust-analyzer-proc-macro-srv on def config
#119124
Merged
Conversation
This file contains hidden or 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
Signed-off-by: onur-ozkan <work@onurozkan.dev>
Signed-off-by: onur-ozkan <work@onurozkan.dev>
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 <work@onurozkan.dev>
|
(rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
onur-ozkan
commented
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" | ||
| }) | ||
| }), | ||
| ) |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Also, this reduces the build time on x build around 15%.
|
@bors r+ |
bors
added
S-waiting-on-bors
|
@bors r- (I think it's worth to make a warning with change-tracker) |
bors
added
S-waiting-on-author
Signed-off-by: onur-ozkan <work@onurozkan.dev>
|
This PR modifies If appropriate, please update |
|
@bors r+ |
bors
added
S-waiting-on-bors
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
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Should be very easy to understand when reviewing commit-by-commit.
Blocker for #118861