Skip to content

Commit c63adb1

Browse files
authored
Rollup merge of rust-lang#35647 - ahmedcharles:spelling, r=alexcrichton
Ensure that attributes are spelled properly.
2 parents f73f128 + 6fbff4f commit c63adb1

23 files changed

+24
-24
lines changed

src/doc/book/variable-bindings.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ warning, but it will still print "Hello, world!":
125125

126126
```text
127127
Compiling hello_world v0.0.1 (file:///home/you/projects/hello_world)
128-
src/main.rs:2:9: 2:10 warning: unused variable: `x`, #[warn(unused_variable)]
128+
src/main.rs:2:9: 2:10 warning: unused variable: `x`, #[warn(unused_variables)]
129129
on by default
130130
src/main.rs:2 let x: i32;
131131
^

src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// ignore-pretty: does not work well with `--test`
1313

1414
#![feature(quote, rustc_private)]
15-
#![deny(unused_variable)]
15+
#![deny(unused_variables)]
1616

1717
extern crate syntax;
1818

src/test/run-pass/enum-variants.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// pretty-expanded FIXME #23616
1212

1313
#![allow(dead_assignment)]
14-
#![allow(unused_variable)]
14+
#![allow(unused_variables)]
1515

1616
enum Animal {
1717
Dog (String, f64),

src/test/run-pass/fn-type-infer.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// pretty-expanded FIXME #23616
1212

13-
#![allow(unused_variable)]
13+
#![allow(unused_variables)]
1414

1515
pub fn main() {
1616
// We should be able to type infer inside of ||s.

src/test/run-pass/generic-tag.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// pretty-expanded FIXME #23616
1212

1313
#![allow(dead_assignment)]
14-
#![allow(unused_variable)]
14+
#![allow(unused_variables)]
1515
#![allow(unknown_features)]
1616
#![feature(box_syntax)]
1717

src/test/run-pass/issue-12660.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ extern crate issue12660aux;
1616

1717
use issue12660aux::{my_fn, MyStruct};
1818

19-
#[allow(path_statement)]
19+
#[allow(path_statements)]
2020
fn main() {
2121
my_fn(MyStruct);
2222
MyStruct;

src/test/run-pass/issue-1451.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// pretty-expanded FIXME #23616
1212

13-
#![allow(unused_variable)]
13+
#![allow(unused_variables)]
1414

1515
struct T { f: extern "Rust" fn() }
1616
struct S { f: extern "Rust" fn() }

src/test/run-pass/issue-3878.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// pretty-expanded FIXME #23616
1212

13-
#![allow(path_statement)]
13+
#![allow(path_statements)]
1414
#![allow(unknown_features)]
1515
#![feature(box_syntax)]
1616

src/test/run-pass/issue-4734.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// `e` is a type which requires a destructor.
1313

1414

15-
#![allow(path_statement)]
15+
#![allow(path_statements)]
1616

1717
struct A { n: isize }
1818
struct B;

src/test/run-pass/issue-7911.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// (Closes #7911) Test that we can use the same self expression
1414
// with different mutability in macro in two methods
1515

16-
#![allow(unused_variable)] // unused foobar_immut + foobar_mut
16+
#![allow(unused_variables)] // unused foobar_immut + foobar_mut
1717
trait FooBar {
1818
fn dummy(&self) { }
1919
}

src/test/run-pass/liveness-assign-imm-local-after-loop.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#![allow(dead_assignment)]
1414
#![allow(unreachable_code)]
15-
#![allow(unused_variable)]
15+
#![allow(unused_variables)]
1616

1717
fn test(_cond: bool) {
1818
let v: isize;

src/test/run-pass/long-while.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// pretty-expanded FIXME #23616
1212

13-
#![allow(unused_variable)]
13+
#![allow(unused_variables)]
1414

1515
pub fn main() {
1616
let mut i: isize = 0;

src/test/run-pass/match-phi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// pretty-expanded FIXME #23616
1212

1313
#![allow(dead_assignment)]
14-
#![allow(unused_variable)]
14+
#![allow(unused_variables)]
1515

1616
enum thing { a, b, c, }
1717

src/test/run-pass/output-slot-variants.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// pretty-expanded FIXME #23616
1212

1313
#![allow(dead_assignment)]
14-
#![allow(unused_variable)]
14+
#![allow(unused_variables)]
1515
#![allow(unknown_features)]
1616
#![feature(box_syntax)]
1717

src/test/run-pass/regions-fn-subtyping.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// pretty-expanded FIXME #23616
1414

1515
#![allow(dead_assignment)]
16-
#![allow(unused_variable)]
16+
#![allow(unused_variables)]
1717
#![allow(unknown_features)]
1818

1919
// FIXME (#22405): Replace `Box::new` with `box` here when/if possible.

src/test/run-pass/traits-default-method-mut.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// pretty-expanded FIXME #23616
1212

1313
#![allow(dead_assignment)]
14-
#![allow(unused_variable)]
14+
#![allow(unused_variables)]
1515

1616
trait Foo {
1717
fn foo(&self, mut v: isize) { v = 1; }

src/test/run-pass/typestate-cfg-nesting.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// pretty-expanded FIXME #23616
1212

1313
#![allow(dead_assignment)]
14-
#![allow(unused_variable)]
14+
#![allow(unused_variables)]
1515

1616
fn f() {
1717
let x = 10; let mut y = 11;

src/test/run-pass/unique-move-drop.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111

12-
#![allow(unused_variable)]
12+
#![allow(unused_variables)]
1313
#![allow(unknown_features)]
1414
#![feature(box_syntax)]
1515

src/test/run-pass/unit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// pretty-expanded FIXME #23616
1212

13-
#![allow(unused_variable)]
13+
#![allow(unused_variables)]
1414
#![allow(dead_assignment)]
1515

1616
fn f(u: ()) { return u; }

src/test/run-pass/unreachable-code-1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111

1212
#![allow(unreachable_code)]
13-
#![allow(unused_variable)]
13+
#![allow(unused_variables)]
1414

1515
fn id(x: bool) -> bool { x }
1616

src/test/run-pass/unreachable-code.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
// except according to those terms.
1010

1111

12-
#![allow(path_statement)]
12+
#![allow(path_statements)]
1313
#![allow(unreachable_code)]
14-
#![allow(unused_variable)]
14+
#![allow(unused_variables)]
1515

1616
fn id(x: bool) -> bool { x }
1717

src/test/run-pass/unused-move.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
// pretty-expanded FIXME #23616
1616

17-
#![allow(path_statement)]
17+
#![allow(path_statements)]
1818
#![allow(unknown_features)]
1919
#![feature(box_syntax)]
2020

src/test/run-pass/while-loop-constraints-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
#![allow(dead_assignment)]
12-
#![allow(unused_variable)]
12+
#![allow(unused_variables)]
1313

1414
pub fn main() {
1515
let mut y: isize = 42;

0 commit comments

Comments
 (0)