[beta] Fix naming conventions for new lints

17 files changed, 24 insertions, 24 deletions

diff --git a/src/test/compile-fail/trait-bounds-not-on-struct.rs b/src/test/compile-fail/trait-bounds-not-on-struct.rs
index 1b1a238a941..76bbca60658 100644
--- a/src/test/compile-fail/trait-bounds-not-on-struct.rs
+++ b/src/test/compile-fail/trait-bounds-not-on-struct.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![allow(bare_trait_object)]
+#![allow(bare_trait_objects)]
 
 struct Foo;
 
diff --git a/src/test/compile-fail/useless_comment.rs b/src/test/compile-fail/useless_comment.rs
index 90eb66728fc..645514971da 100644
--- a/src/test/compile-fail/useless_comment.rs
+++ b/src/test/compile-fail/useless_comment.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![deny(unused_doc_comment)]
+#![deny(unused_doc_comments)]
 
 fn foo() {
     /// a //~ ERROR doc comment not used by rustdoc
diff --git a/src/test/ui/edition-lint-paths.rs b/src/test/ui/edition-lint-paths.rs
index 0b49e72ccd9..8164a862a18 100644
--- a/src/test/ui/edition-lint-paths.rs
+++ b/src/test/ui/edition-lint-paths.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 #![feature(crate_in_paths)]
-#![deny(absolute_path_starting_with_module)]
+#![deny(absolute_paths_not_starting_with_crate)]
 #![allow(unused)]
 
 pub mod foo {
diff --git a/src/test/ui/edition-lint-paths.stderr b/src/test/ui/edition-lint-paths.stderr
index 509527e0374..fca6edfc055 100644
--- a/src/test/ui/edition-lint-paths.stderr
+++ b/src/test/ui/edition-lint-paths.stderr
@@ -7,8 +7,8 @@ LL |     use ::bar::Bar;
 note: lint level defined here
   --> $DIR/edition-lint-paths.rs:12:9
    |
-LL | #![deny(absolute_path_starting_with_module)]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL | #![deny(absolute_paths_not_starting_with_crate)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
    = note: for more information, see issue TBD
 
diff --git a/src/test/ui/in-band-lifetimes/ellided-lifetimes.rs b/src/test/ui/in-band-lifetimes/ellided-lifetimes.rs
index 5151abd6823..3739ffe6a26 100644
--- a/src/test/ui/in-band-lifetimes/ellided-lifetimes.rs
+++ b/src/test/ui/in-band-lifetimes/ellided-lifetimes.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 #![allow(warnings)]
 #![allow(unused_variables, dead_code, unused, bad_style)]
-#![deny(elided_lifetime_in_path)]
+#![deny(elided_lifetimes_in_paths)]
 
 struct Foo<'a> { x: &'a u32 }
 fn foo(x: &Foo) {
diff --git a/src/test/ui/in-band-lifetimes/ellided-lifetimes.stderr b/src/test/ui/in-band-lifetimes/ellided-lifetimes.stderr
index ba58ca1ed95..c2bd2c261ac 100644
--- a/src/test/ui/in-band-lifetimes/ellided-lifetimes.stderr
+++ b/src/test/ui/in-band-lifetimes/ellided-lifetimes.stderr
@@ -7,8 +7,8 @@ LL | fn foo(x: &Foo) {
 note: lint level defined here
   --> $DIR/ellided-lifetimes.rs:12:9
    |
-LL | #![deny(elided_lifetime_in_path)]
-   |         ^^^^^^^^^^^^^^^^^^^^^^^
+LL | #![deny(elided_lifetimes_in_paths)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/in-band-lifetimes/single_use_lifetimes-2.rs b/src/test/ui/in-band-lifetimes/single_use_lifetimes-2.rs
index 005f1f033b6..6aa95bc3ee5 100644
--- a/src/test/ui/in-band-lifetimes/single_use_lifetimes-2.rs
+++ b/src/test/ui/in-band-lifetimes/single_use_lifetimes-2.rs
@@ -7,7 +7,7 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-#![deny(single_use_lifetime)]
+#![deny(single_use_lifetimes)]
 // FIXME(#44752) -- this scenario should not be warned
 fn deref<'x>() -> &'x u32 { //~ ERROR lifetime name `'x` only used once
     22
diff --git a/src/test/ui/in-band-lifetimes/single_use_lifetimes-2.stderr b/src/test/ui/in-band-lifetimes/single_use_lifetimes-2.stderr
index 38d05369fb8..33d35de9356 100644
--- a/src/test/ui/in-band-lifetimes/single_use_lifetimes-2.stderr
+++ b/src/test/ui/in-band-lifetimes/single_use_lifetimes-2.stderr
@@ -7,8 +7,8 @@ LL | fn deref<'x>() -> &'x u32 { //~ ERROR lifetime name `'x` only used once
 note: lint level defined here
   --> $DIR/single_use_lifetimes-2.rs:10:9
    |
-LL | #![deny(single_use_lifetime)]
-   |         ^^^^^^^^^^^^^^^^^^^
+LL | #![deny(single_use_lifetimes)]
+   |         ^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/in-band-lifetimes/single_use_lifetimes-3.rs b/src/test/ui/in-band-lifetimes/single_use_lifetimes-3.rs
index 263548ca7f4..1855ec7b5ac 100644
--- a/src/test/ui/in-band-lifetimes/single_use_lifetimes-3.rs
+++ b/src/test/ui/in-band-lifetimes/single_use_lifetimes-3.rs
@@ -7,7 +7,7 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-#![deny(single_use_lifetime)]
+#![deny(single_use_lifetimes)]
 struct Foo<'x> { //~ ERROR lifetime name `'x` only used once
     x: &'x u32 // no warning!
 }
diff --git a/src/test/ui/in-band-lifetimes/single_use_lifetimes-3.stderr b/src/test/ui/in-band-lifetimes/single_use_lifetimes-3.stderr
index 49c06aafbe5..8226f2fdffd 100644
--- a/src/test/ui/in-band-lifetimes/single_use_lifetimes-3.stderr
+++ b/src/test/ui/in-band-lifetimes/single_use_lifetimes-3.stderr
@@ -7,8 +7,8 @@ LL | struct Foo<'x> { //~ ERROR lifetime name `'x` only used once
 note: lint level defined here
   --> $DIR/single_use_lifetimes-3.rs:10:9
    |
-LL | #![deny(single_use_lifetime)]
-   |         ^^^^^^^^^^^^^^^^^^^
+LL | #![deny(single_use_lifetimes)]
+   |         ^^^^^^^^^^^^^^^^^^^^
 
 error: lifetime name `'y` only used once
   --> $DIR/single_use_lifetimes-3.rs:16:6
diff --git a/src/test/ui/in-band-lifetimes/single_use_lifetimes-4.rs b/src/test/ui/in-band-lifetimes/single_use_lifetimes-4.rs
index 4ac8f8c0d4e..97982ff53b5 100644
--- a/src/test/ui/in-band-lifetimes/single_use_lifetimes-4.rs
+++ b/src/test/ui/in-band-lifetimes/single_use_lifetimes-4.rs
@@ -7,7 +7,7 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-#![deny(single_use_lifetime)]
+#![deny(single_use_lifetimes)]
  // Neither should issue a warning, as explicit lifetimes are mandatory in this case
 struct Foo<'x> { //~ ERROR lifetime name `'x` only used once
     x: &'x u32
diff --git a/src/test/ui/in-band-lifetimes/single_use_lifetimes-4.stderr b/src/test/ui/in-band-lifetimes/single_use_lifetimes-4.stderr
index 2df370f5d02..fbe6f2d1867 100644
--- a/src/test/ui/in-band-lifetimes/single_use_lifetimes-4.stderr
+++ b/src/test/ui/in-band-lifetimes/single_use_lifetimes-4.stderr
@@ -7,8 +7,8 @@ LL | struct Foo<'x> { //~ ERROR lifetime name `'x` only used once
 note: lint level defined here
   --> $DIR/single_use_lifetimes-4.rs:10:9
    |
-LL | #![deny(single_use_lifetime)]
-   |         ^^^^^^^^^^^^^^^^^^^
+LL | #![deny(single_use_lifetimes)]
+   |         ^^^^^^^^^^^^^^^^^^^^
 
 error: lifetime name `'x` only used once
   --> $DIR/single_use_lifetimes-4.rs:16:10
diff --git a/src/test/ui/in-band-lifetimes/single_use_lifetimes-5.rs b/src/test/ui/in-band-lifetimes/single_use_lifetimes-5.rs
index cef904c4896..e9f3cb9a137 100644
--- a/src/test/ui/in-band-lifetimes/single_use_lifetimes-5.rs
+++ b/src/test/ui/in-band-lifetimes/single_use_lifetimes-5.rs
@@ -7,7 +7,7 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-#![deny(single_use_lifetime)]
+#![deny(single_use_lifetimes)]
 // Should not issue a warning, as explicit lifetimes are mandatory in this case:
 trait Foo<'x> { //~ ERROR lifetime name `'x` only used once
     fn foo(&self, arg: &'x u32);
diff --git a/src/test/ui/in-band-lifetimes/single_use_lifetimes-5.stderr b/src/test/ui/in-band-lifetimes/single_use_lifetimes-5.stderr
index eec426e4e63..bb96fd26006 100644
--- a/src/test/ui/in-band-lifetimes/single_use_lifetimes-5.stderr
+++ b/src/test/ui/in-band-lifetimes/single_use_lifetimes-5.stderr
@@ -7,8 +7,8 @@ LL | trait Foo<'x> { //~ ERROR lifetime name `'x` only used once
 note: lint level defined here
   --> $DIR/single_use_lifetimes-5.rs:10:9
    |
-LL | #![deny(single_use_lifetime)]
-   |         ^^^^^^^^^^^^^^^^^^^
+LL | #![deny(single_use_lifetimes)]
+   |         ^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/in-band-lifetimes/single_use_lifetimes.rs b/src/test/ui/in-band-lifetimes/single_use_lifetimes.rs
index a97056b6240..af3457523ca 100644
--- a/src/test/ui/in-band-lifetimes/single_use_lifetimes.rs
+++ b/src/test/ui/in-band-lifetimes/single_use_lifetimes.rs
@@ -7,7 +7,7 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-#![deny(single_use_lifetime)]
+#![deny(single_use_lifetimes)]
 
 fn deref<'x>(v: &'x u32) -> u32 { //~ ERROR lifetime name `'x` only used once
     *v
diff --git a/src/test/ui/in-band-lifetimes/single_use_lifetimes.stderr b/src/test/ui/in-band-lifetimes/single_use_lifetimes.stderr
index 15917d3c085..a96f5c5c4e7 100644
--- a/src/test/ui/in-band-lifetimes/single_use_lifetimes.stderr
+++ b/src/test/ui/in-band-lifetimes/single_use_lifetimes.stderr
@@ -7,8 +7,8 @@ LL | fn deref<'x>(v: &'x u32) -> u32 { //~ ERROR lifetime name `'x` only used on
 note: lint level defined here
   --> $DIR/single_use_lifetimes.rs:10:9
    |
-LL | #![deny(single_use_lifetime)]
-   |         ^^^^^^^^^^^^^^^^^^^
+LL | #![deny(single_use_lifetimes)]
+   |         ^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/inference_unstable.stderr b/src/test/ui/inference_unstable.stderr
index a217bc57b36..3a5cb6f2b2e 100644
--- a/src/test/ui/inference_unstable.stderr
+++ b/src/test/ui/inference_unstable.stderr
@@ -4,7 +4,7 @@ warning: a method with this name may be added to the standard library in the fut
 LL |     assert_eq!('x'.ipu_flatten(), 1);
    |                    ^^^^^^^^^^^
    |
-   = note: #[warn(unstable_name_collision)] on by default
+   = note: #[warn(unstable_name_collisions)] on by default
    = warning: once this method is added to the standard library, the ambiguity may cause an error or change in behavior!
    = note: for more information, see issue #48919 <https://github.com/rust-lang/rust/issues/48919>
    = help: call with fully qualified syntax `inference_unstable_itertools::IpuItertools::ipu_flatten(...)` to keep using the current method