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

Update RLS and Rustfmt #84886

Merged
merged 2 commits into from
May 5, 2021
Merged

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented May 3, 2021

Closes #84537. Closes #84538.

I know there's #82208 in progress but I'm not sure which we want to land first.

Also, I'm getting Rustfmt test failures due to inner attributes not permitted:

error: an inner attribute is not permitted in this context
 --> tests/target/issue-3592.rs:4:13
  |
4 |             #![cfg(unix)]
  |             ^^^^^^^^^^^^^
  |
  = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.

error: an inner attribute is not permitted in this context
 --> tests/target/issue-3592.rs:8:13
  |
8 |             #![cfg(not(unix))]
  |             ^^^^^^^^^^^^^^^^^^
  |
  = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.

error: an inner attribute is not permitted in this context
   --> tests/source/match.rs:413:9
    |
413 |         #![allow(simple_match)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.

error: an inner attribute is not permitted in this context
   --> tests/target/match.rs:444:9
    |
444 |         #![allow(simple_match)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: inner attributes, like `#![no_std]`, annotate the item enclosing them, and are usually found at the beginning of source files. Outer attributes, like `#[test]`, annotate the item following them.

test test::system_tests ... FAILED
test test::idempotence_tests ... FAILED

but let's see what CI says, first.

cc @calebcartwright

@rust-highfive
Copy link
Collaborator

Some changes occurred in src/tools/rustfmt.

cc @calebcartwright

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 3, 2021
@rust-log-analyzer

This comment has been minimized.

@joshtriplett
Copy link
Member

@Xanewok Would you consider applying and including rust-lang/rls#1732 in this, please?

@Xanewok
Copy link
Member Author

Xanewok commented May 3, 2021

@Xanewok Would you consider applying and including rust-lang/rls#1732 in this, please?

Done :)

@joshtriplett
Copy link
Member

@Xanewok Thanks!

@Xanewok
Copy link
Member Author

Xanewok commented May 3, 2021

I'm confused, x86_64-gnu-tools decides to skip itself due to lack of submodules changes (??). Force-pushed it again and it's the same result.

Should we approve it and see if this makes it past bors or should we wait for #82208 to land?

@jyn514
Copy link
Member

jyn514 commented May 4, 2021

I have no preference on whether to land this or #82208 first; it might be faster to land this though since it's just a routine bump and 82208 still needs review for the bootstrap changes.

@Xanewok
Copy link
Member Author

Xanewok commented May 4, 2021

Let's try it then:

@bors r+ p=1

@bors
Copy link
Contributor

bors commented May 4, 2021

📌 Commit 5ad58cd059be13728813dab1332795cafbb10ce9 has been approved by Xanewok

@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 May 4, 2021
@bors
Copy link
Contributor

bors commented May 4, 2021

⌛ Testing commit 5ad58cd059be13728813dab1332795cafbb10ce9 with merge 1439d5a0a3b533108d9399447b5292ffa79ead5d...

@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented May 4, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 4, 2021
@jyn514
Copy link
Member

jyn514 commented May 4, 2021

Looks like a rustfmt test failure, cc @calebcartwright

@Mark-Simulacrum
Copy link
Member

Likely due to #83312, cc #84879

@Xanewok
Copy link
Member Author

Xanewok commented May 4, 2021

It doesn't seem like we'll add back the support for inner attributes in that context in time before we need to fix the toolstate, correct? Should we ignore these tests for now?

@calebcartwright
Copy link
Member

Yeah I'll remove those snippets from our set of test files; no point keeping around something the parser won't accept and we can always add them back if something changes.

I'll patch it in rustfmt here in a little bit

@calebcartwright
Copy link
Member

calebcartwright commented May 4, 2021

Have updated rustfmt and opened rust-lang/rls#1734 in RLS to pull in the updates

Edit - actually I guess the RLS PR isn't really needed to address things here since it's just tests on the rustfmt side. Let me know/feel free to close that RLS PR if you'd prefer to only update the rustfmt submod

@Xanewok
Copy link
Member Author

Xanewok commented May 5, 2021

Updated the Rustfmt rev both here and in the RLS (it's nice to migrate to a new version in unison), so let's try again:

@bors r+

@bors
Copy link
Contributor

bors commented May 5, 2021

📌 Commit dcaf74b has been approved by Xanewok

@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 May 5, 2021
@bors
Copy link
Contributor

bors commented May 5, 2021

⌛ Testing commit dcaf74b with merge 24acc38...

@bors
Copy link
Contributor

bors commented May 5, 2021

☀️ Test successful - checks-actions
Approved by: Xanewok
Pushing 24acc38 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 5, 2021
@bors bors merged commit 24acc38 into rust-lang:master May 5, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 5, 2021
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #84886!

Tested on commit 24acc38.
Direct link to PR: #84886

🎉 rls on windows: build-fail → test-pass (cc @Xanewok).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok).
🎉 rustfmt on windows: build-fail → test-pass (cc @calebcartwright @topecongiro).
🎉 rustfmt on linux: build-fail → test-pass (cc @calebcartwright @topecongiro).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request May 5, 2021
Tested on commit rust-lang/rust@24acc38.
Direct link to PR: <rust-lang/rust#84886>

🎉 rls on windows: build-fail → test-pass (cc @Xanewok).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok).
🎉 rustfmt on windows: build-fail → test-pass (cc @calebcartwright @topecongiro).
🎉 rustfmt on linux: build-fail → test-pass (cc @calebcartwright @topecongiro).
@Xanewok Xanewok deleted the update-rls-and-rustfmt branch May 5, 2021 16:30
bors added a commit to rust-lang-ci/rust that referenced this pull request May 5, 2021
…crum

[beta] Prepare beta 1.53.0

Along with updating the channel and updating the bootstrap compiler, this also includes:

* 692454d - Fixes the diagnostics difference we had for some cycles already
* 9157430 - Disables the known broken RLS builder on AArch64 Windows
* rust-lang#84183 - Update RELEASES.md for 1.52.0
* rust-lang#84950 - Revert PR 83866
* rust-lang#84886 - Update RLS and Rustfmt

Changes we backported to 1.52.0 that we also need to include in 1.53.0 to avoid regressing:

* rust-lang#84867 - rustdoc: revert deref recur to resume inclusion of impl ExtTrait<Local> for ExtType
* rust-lang#84759 - [beta] remove assert_matches
* rust-lang#83171 - Revert PR 81473 to resolve (on beta) issues 81626 and 81658.

r? `@ghost`
@Xanewok Xanewok mentioned this pull request May 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rustfmt no longer builds after rust-lang/rust#84310 rls no longer builds after rust-lang/rust#84310
9 participants