submodules: Update RLS and Rustfmt #72423
Closed
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
|
@topecongiro I'm getting the undefined CFG_RELEASE errors: Did you come to any conclusion how to solve that in your environment or how we can fix that here? |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
@Xanewok We simply set @mibac138 @petrochenkov Are you aware of any good workaround? |
|
It seems like another option would be to use |
|
It should be fine to set CFG_RELEASE for all builds as well; please leave a comment noting that rustfmt (and potentially other tools) rely on it due to rustc_attr dependencies. |
|
@Xanewok any updates? |
|
Something like this should work: diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 8ebad95ea17..054c7412b84 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -254,6 +254,10 @@ pub fn prepare_tool_cargo(
cargo.env("CFG_RELEASE_CHANNEL", &builder.config.channel);
cargo.env("CFG_VERSION", builder.rust_version());
+ // CFG_RELEASE is needed by rustfmt (and possibly other tools) which
+ // import rustc-ap-rustc_attr which requires this to be set for the
+ // `#[cfg(version(...))]` attribute.
+ cargo.env("CFG_RELEASE", builder.rust_release());
cargo.env("CFG_RELEASE_NUM", channel::CFG_RELEASE_NUM);
let info = GitInfo::new(builder.config.ignore_git, &dir); |
Since rustc-ap-* v659 we now need to set CFG_RELEASE for rustc-ap-rustc_attr for `#[cfg(version(...))]` to work. Co-authored-by: Eric Huss <ehuss@users.noreply.github.com>
|
Sorry for the delay. @ehuss submitted a commit with your changes, thanks! |
|
@bors r=Xanewok p=1 |
|
📌 Commit 32c23a1 has been approved by |
bors
added
the
S-waiting-on-bors
|
giving this priority for release: |
|
⌛ Testing commit 32c23a1 with merge 2ec434fcea78608b041a573d46e7c2b7bb1f3467... |
|
💔 Test failed - checks-azure |
bors
added
S-waiting-on-review
|
#55617 shifted diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml
index cbf7d09f2e4..1b1f4447966 100644
--- a/src/tools/rustc-workspace-hack/Cargo.toml
+++ b/src/tools/rustc-workspace-hack/Cargo.toml
@@ -22,6 +22,7 @@ features = [
"basetsd",
"consoleapi",
"errhandlingapi",
+ "fibersapi",
"ioapiset",
"jobapi",
"jobapi2", |
|
Note that #72671 also fixes RLS and rustfmt toolstates. I'd prefer to land that rather than this to avoid duplication. |
|
☔ The latest upstream changes (presumably #72671) made this pull request unmergeable. Please resolve the merge conflicts. |
|
Succeeded by #72671. |
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Fixes #72231
Fixes #72232
r? @ghost
cc @topecongiro