Ensure that attributes are spelled properly.

23 files changed, 24 insertions, 24 deletions

diff --git a/src/doc/book/variable-bindings.md b/src/doc/book/variable-bindings.md
index b6751f57a97..30e922d7f4d 100644
--- a/src/doc/book/variable-bindings.md
+++ b/src/doc/book/variable-bindings.md
@@ -125,7 +125,7 @@ warning, but it will still print "Hello, world!":
 
 ```text
    Compiling hello_world v0.0.1 (file:///home/you/projects/hello_world)
-src/main.rs:2:9: 2:10 warning: unused variable: `x`, #[warn(unused_variable)]
+src/main.rs:2:9: 2:10 warning: unused variable: `x`, #[warn(unused_variables)]
    on by default
 src/main.rs:2     let x: i32;
                       ^
diff --git a/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs b/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs
index e9de95b95e5..460eab998c6 100644
--- a/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs
+++ b/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs
@@ -12,7 +12,7 @@
 // ignore-pretty: does not work well with `--test`
 
 #![feature(quote, rustc_private)]
-#![deny(unused_variable)]
+#![deny(unused_variables)]
 
 extern crate syntax;
 
diff --git a/src/test/run-pass/enum-variants.rs b/src/test/run-pass/enum-variants.rs
index 77e6141d559..5eb7a243acf 100644
--- a/src/test/run-pass/enum-variants.rs
+++ b/src/test/run-pass/enum-variants.rs
@@ -11,7 +11,7 @@
 // pretty-expanded FIXME #23616
 
 #![allow(dead_assignment)]
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 
 enum Animal {
     Dog (String, f64),
diff --git a/src/test/run-pass/fn-type-infer.rs b/src/test/run-pass/fn-type-infer.rs
index 3e1674a97e0..ad6c10611aa 100644
--- a/src/test/run-pass/fn-type-infer.rs
+++ b/src/test/run-pass/fn-type-infer.rs
@@ -10,7 +10,7 @@
 
 // pretty-expanded FIXME #23616
 
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 
 pub fn main() {
     // We should be able to type infer inside of ||s.
diff --git a/src/test/run-pass/generic-tag.rs b/src/test/run-pass/generic-tag.rs
index 942bdb97ba2..75fd9fcb7b6 100644
--- a/src/test/run-pass/generic-tag.rs
+++ b/src/test/run-pass/generic-tag.rs
@@ -11,7 +11,7 @@
 // pretty-expanded FIXME #23616
 
 #![allow(dead_assignment)]
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 #![allow(unknown_features)]
 #![feature(box_syntax)]
 
diff --git a/src/test/run-pass/issue-12660.rs b/src/test/run-pass/issue-12660.rs
index 331f9d991d6..ebf390cfe4f 100644
--- a/src/test/run-pass/issue-12660.rs
+++ b/src/test/run-pass/issue-12660.rs
@@ -16,7 +16,7 @@ extern crate issue12660aux;
 
 use issue12660aux::{my_fn, MyStruct};
 
-#[allow(path_statement)]
+#[allow(path_statements)]
 fn main() {
     my_fn(MyStruct);
     MyStruct;
diff --git a/src/test/run-pass/issue-1451.rs b/src/test/run-pass/issue-1451.rs
index 1cbe986e88a..b65a3a9ab70 100644
--- a/src/test/run-pass/issue-1451.rs
+++ b/src/test/run-pass/issue-1451.rs
@@ -10,7 +10,7 @@
 
 // pretty-expanded FIXME #23616
 
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 
 struct T { f: extern "Rust" fn() }
 struct S { f: extern "Rust" fn() }
diff --git a/src/test/run-pass/issue-3878.rs b/src/test/run-pass/issue-3878.rs
index c98110b9054..5d094af2149 100644
--- a/src/test/run-pass/issue-3878.rs
+++ b/src/test/run-pass/issue-3878.rs
@@ -10,7 +10,7 @@
 
 // pretty-expanded FIXME #23616
 
-#![allow(path_statement)]
+#![allow(path_statements)]
 #![allow(unknown_features)]
 #![feature(box_syntax)]
 
diff --git a/src/test/run-pass/issue-4734.rs b/src/test/run-pass/issue-4734.rs
index 88a3b24d14f..9fb826712ad 100644
--- a/src/test/run-pass/issue-4734.rs
+++ b/src/test/run-pass/issue-4734.rs
@@ -12,7 +12,7 @@
 // `e` is a type which requires a destructor.
 
 
-#![allow(path_statement)]
+#![allow(path_statements)]
 
 struct A { n: isize }
 struct B;
diff --git a/src/test/run-pass/issue-7911.rs b/src/test/run-pass/issue-7911.rs
index 3eb593708be..5324ddb49e7 100644
--- a/src/test/run-pass/issue-7911.rs
+++ b/src/test/run-pass/issue-7911.rs
@@ -13,7 +13,7 @@
 // (Closes #7911) Test that we can use the same self expression
 // with different mutability in macro in two methods
 
-#![allow(unused_variable)] // unused foobar_immut + foobar_mut
+#![allow(unused_variables)] // unused foobar_immut + foobar_mut
 trait FooBar {
     fn dummy(&self) { }
 }
diff --git a/src/test/run-pass/liveness-assign-imm-local-after-loop.rs b/src/test/run-pass/liveness-assign-imm-local-after-loop.rs
index df89809ef1f..dfa08055046 100644
--- a/src/test/run-pass/liveness-assign-imm-local-after-loop.rs
+++ b/src/test/run-pass/liveness-assign-imm-local-after-loop.rs
@@ -12,7 +12,7 @@
 
 #![allow(dead_assignment)]
 #![allow(unreachable_code)]
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 
 fn test(_cond: bool) {
     let v: isize;
diff --git a/src/test/run-pass/long-while.rs b/src/test/run-pass/long-while.rs
index 6e0f1bb87a5..ce55c761202 100644
--- a/src/test/run-pass/long-while.rs
+++ b/src/test/run-pass/long-while.rs
@@ -10,7 +10,7 @@
 
 // pretty-expanded FIXME #23616
 
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 
 pub fn main() {
     let mut i: isize = 0;
diff --git a/src/test/run-pass/match-phi.rs b/src/test/run-pass/match-phi.rs
index ac070cb1f25..24185ffa412 100644
--- a/src/test/run-pass/match-phi.rs
+++ b/src/test/run-pass/match-phi.rs
@@ -11,7 +11,7 @@
 // pretty-expanded FIXME #23616
 
 #![allow(dead_assignment)]
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 
 enum thing { a, b, c, }
 
diff --git a/src/test/run-pass/output-slot-variants.rs b/src/test/run-pass/output-slot-variants.rs
index 33489688d4a..4c3017c066e 100644
--- a/src/test/run-pass/output-slot-variants.rs
+++ b/src/test/run-pass/output-slot-variants.rs
@@ -11,7 +11,7 @@
 // pretty-expanded FIXME #23616
 
 #![allow(dead_assignment)]
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 #![allow(unknown_features)]
 #![feature(box_syntax)]
 
diff --git a/src/test/run-pass/regions-fn-subtyping.rs b/src/test/run-pass/regions-fn-subtyping.rs
index e5b652c306f..fc42fbc714c 100644
--- a/src/test/run-pass/regions-fn-subtyping.rs
+++ b/src/test/run-pass/regions-fn-subtyping.rs
@@ -13,7 +13,7 @@
 // pretty-expanded FIXME #23616
 
 #![allow(dead_assignment)]
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 #![allow(unknown_features)]
 
 // FIXME (#22405): Replace `Box::new` with `box` here when/if possible.
diff --git a/src/test/run-pass/traits-default-method-mut.rs b/src/test/run-pass/traits-default-method-mut.rs
index 3f61eb47233..bcdadb1d90d 100644
--- a/src/test/run-pass/traits-default-method-mut.rs
+++ b/src/test/run-pass/traits-default-method-mut.rs
@@ -11,7 +11,7 @@
 // pretty-expanded FIXME #23616
 
 #![allow(dead_assignment)]
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 
 trait Foo {
     fn foo(&self, mut v: isize) { v = 1; }
diff --git a/src/test/run-pass/typestate-cfg-nesting.rs b/src/test/run-pass/typestate-cfg-nesting.rs
index 86184f6cf0f..2acaff26269 100644
--- a/src/test/run-pass/typestate-cfg-nesting.rs
+++ b/src/test/run-pass/typestate-cfg-nesting.rs
@@ -11,7 +11,7 @@
 // pretty-expanded FIXME #23616
 
 #![allow(dead_assignment)]
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 
 fn f() {
     let x = 10; let mut y = 11;
diff --git a/src/test/run-pass/unique-move-drop.rs b/src/test/run-pass/unique-move-drop.rs
index 530ba478910..c2813771b7c 100644
--- a/src/test/run-pass/unique-move-drop.rs
+++ b/src/test/run-pass/unique-move-drop.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 #![allow(unknown_features)]
 #![feature(box_syntax)]
 
diff --git a/src/test/run-pass/unit.rs b/src/test/run-pass/unit.rs
index 2679c4c0331..67eceba020c 100644
--- a/src/test/run-pass/unit.rs
+++ b/src/test/run-pass/unit.rs
@@ -10,7 +10,7 @@
 
 // pretty-expanded FIXME #23616
 
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 #![allow(dead_assignment)]
 
 fn f(u: ()) { return u; }
diff --git a/src/test/run-pass/unreachable-code-1.rs b/src/test/run-pass/unreachable-code-1.rs
index c1c069236c8..189c5cdb9b7 100644
--- a/src/test/run-pass/unreachable-code-1.rs
+++ b/src/test/run-pass/unreachable-code-1.rs
@@ -10,7 +10,7 @@
 
 
 #![allow(unreachable_code)]
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 
 fn id(x: bool) -> bool { x }
 
diff --git a/src/test/run-pass/unreachable-code.rs b/src/test/run-pass/unreachable-code.rs
index e19fda5f872..5cb5e8c4f99 100644
--- a/src/test/run-pass/unreachable-code.rs
+++ b/src/test/run-pass/unreachable-code.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 
-#![allow(path_statement)]
+#![allow(path_statements)]
 #![allow(unreachable_code)]
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 
 fn id(x: bool) -> bool { x }
 
diff --git a/src/test/run-pass/unused-move.rs b/src/test/run-pass/unused-move.rs
index 015b6f80946..e4b9d14fb4b 100644
--- a/src/test/run-pass/unused-move.rs
+++ b/src/test/run-pass/unused-move.rs
@@ -14,7 +14,7 @@
 
 // pretty-expanded FIXME #23616
 
-#![allow(path_statement)]
+#![allow(path_statements)]
 #![allow(unknown_features)]
 #![feature(box_syntax)]
 
diff --git a/src/test/run-pass/while-loop-constraints-2.rs b/src/test/run-pass/while-loop-constraints-2.rs
index 6e339232475..6e9e7bc24d6 100644
--- a/src/test/run-pass/while-loop-constraints-2.rs
+++ b/src/test/run-pass/while-loop-constraints-2.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 #![allow(dead_assignment)]
-#![allow(unused_variable)]
+#![allow(unused_variables)]
 
 pub fn main() {
     let mut y: isize = 42;