Update RLS and Rustfmt

[Xanewok]

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:

Details

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]

Some changes occurred in src/tools/rustfmt.

cc @calebcartwright

[rust-highfive]

r? @Mark-Simulacrum

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

[rust-highfive]

⚠️ Warning ⚠️

• These commits modify submodules.

[joshtriplett]

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

[Xanewok]

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

Done :)

[joshtriplett]

@Xanewok Thanks!

[Xanewok]

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]

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]

Let's try it then:

@bors r+ p=1

[bors]

📌 Commit 5ad58cd059be13728813dab1332795cafbb10ce9 has been approved by Xanewok

[bors]

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

[bors]

💔 Test failed - checks-actions

[jyn514]

Looks like a rustfmt test failure, cc @calebcartwright

[Mark-Simulacrum]

Likely due to #83312, cc #84879

[Xanewok]

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]

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]

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]

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]

📌 Commit dcaf74b has been approved by Xanewok

[bors]

⌛ Testing commit dcaf74b with merge 24acc38...

[bors]

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

[rust-highfive]

📣 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).