From 6fbff4f06a7e5b62d985c2ce28c5303bf5b8fe43 Mon Sep 17 00:00:00 2001 From: Ahmed Charles Date: Sat, 13 Aug 2016 02:41:43 -0700 Subject: [PATCH] Ensure that attributes are spelled properly. --- src/doc/book/variable-bindings.md | 2 +- src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs | 2 +- src/test/run-pass/enum-variants.rs | 2 +- src/test/run-pass/fn-type-infer.rs | 2 +- src/test/run-pass/generic-tag.rs | 2 +- src/test/run-pass/issue-12660.rs | 2 +- src/test/run-pass/issue-1451.rs | 2 +- src/test/run-pass/issue-3878.rs | 2 +- src/test/run-pass/issue-4734.rs | 2 +- src/test/run-pass/issue-7911.rs | 2 +- src/test/run-pass/liveness-assign-imm-local-after-loop.rs | 2 +- src/test/run-pass/long-while.rs | 2 +- src/test/run-pass/match-phi.rs | 2 +- src/test/run-pass/output-slot-variants.rs | 2 +- src/test/run-pass/regions-fn-subtyping.rs | 2 +- src/test/run-pass/traits-default-method-mut.rs | 2 +- src/test/run-pass/typestate-cfg-nesting.rs | 2 +- src/test/run-pass/unique-move-drop.rs | 2 +- src/test/run-pass/unit.rs | 2 +- src/test/run-pass/unreachable-code-1.rs | 2 +- src/test/run-pass/unreachable-code.rs | 4 ++-- src/test/run-pass/unused-move.rs | 2 +- src/test/run-pass/while-loop-constraints-2.rs | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/doc/book/variable-bindings.md b/src/doc/book/variable-bindings.md index b6751f57a9721..30e922d7f4dc0 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 e9de95b95e5fd..460eab998c6fb 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 77e6141d5592d..5eb7a243acf0c 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 3e1674a97e089..ad6c10611aaa0 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 942bdb97ba203..75fd9fcb7b6d8 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 331f9d991d681..ebf390cfe4fc3 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 1cbe986e88af0..b65a3a9ab7084 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 c98110b9054be..5d094af2149e1 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 88a3b24d14fc8..9fb826712adc0 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 3eb593708bee8..5324ddb49e79f 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 df89809ef1fed..dfa080550469a 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 6e0f1bb87a5fb..ce55c76120235 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 ac070cb1f2542..24185ffa4128f 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 33489688d4a5c..4c3017c066e81 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 e5b652c306f4d..fc42fbc714c09 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 3f61eb47233b6..bcdadb1d90d38 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 86184f6cf0f43..2acaff262690b 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 530ba4789102e..c2813771b7c34 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 2679c4c033121..67eceba020c80 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 c1c069236c88d..189c5cdb9b747 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 e19fda5f872d2..5cb5e8c4f99cd 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 015b6f80946f8..e4b9d14fb4b30 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 6e3392324753b..6e9e7bc24d6a0 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;