about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-05-05 11:05:27 +0000
committerbors <bors@rust-lang.org>2021-05-05 11:05:27 +0000
commit24acc388da2cdbe1ec79b6933402941b6fffb26b (patch)
tree1050f5679f36361d3e42129f675c0630ae7fa4ef /src
parent2d11e257945c710d406e77903764ad4b7a52bda5 (diff)
parentdcaf74bb6cf7f4127e7476e0975c572a82a6cc2d (diff)
downloadrust-24acc388da2cdbe1ec79b6933402941b6fffb26b.tar.gz
rust-24acc388da2cdbe1ec79b6933402941b6fffb26b.zip
Auto merge of #84886 - Xanewok:update-rls-and-rustfmt, r=Xanewok
Update RLS and Rustfmt

Closes #84537. Closes #84538.

I know there's https://github.com/rust-lang/rust/pull/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
```

</details>

but let's see what CI says, first.

cc `@calebcartwright`
Diffstat (limited to 'src')
m---------src/tools/rls0
m---------src/tools/rustfmt10
-rw-r--r--src/tools/tidy/src/deps.rs2
3 files changed, 7 insertions, 5 deletions
diff --git a/src/tools/rls b/src/tools/rls
-Subproject 74d1800c25498689c5b5120a1e8495fce0cd0d0
+Subproject 359513ce678efba186972e4f280dbc7046cac15
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
-Subproject 0bd2b1927c2b02a6fe7447d58e897cf1f1a1d41
+Subproject 2a3635d5d1218c726ff58af4bc35418836143f6
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index 5a843ea61ec..b604b39967e 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -189,6 +189,8 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[
     "winapi-i686-pc-windows-gnu",
     "winapi-util",
     "winapi-x86_64-pc-windows-gnu",
+    // this is a false-positive: it's only used by rustfmt, but because it's enabled through a feature, tidy thinks it's used by rustc as well.
+    "yansi-term",
 ];
 
 /// Dependency checks.