diff --git a/src/doc/rustc/src/lints/listing/allowed-by-default.md b/src/doc/rustc/src/lints/listing/allowed-by-default.md index e1a3f96a6fe6e320c3001a12b8a9d579f45a8d14..7768b41f85ee44c7d906a06fc7d6bb84a7057f99 100644 --- a/src/doc/rustc/src/lints/listing/allowed-by-default.md +++ b/src/doc/rustc/src/lints/listing/allowed-by-default.md @@ -64,7 +64,7 @@ To fix it, do as the help message suggests: ```rust #![feature(dyn_trait)] -#![deny(bare_trait_object)] +#![deny(bare_trait_objects)] trait Trait { } diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs index 02c2aa1c71ba08efcb81d296198a4a77a2d79dcb..d20cea8331fdd841b59840ade655c4c25be23dab 100644 --- a/src/librustc/hir/lowering.rs +++ b/src/librustc/hir/lowering.rs @@ -4125,7 +4125,7 @@ fn new_implicit_lifetime(&mut self, span: Span) -> hir::Lifetime { fn maybe_lint_bare_trait(&self, span: Span, id: NodeId, is_global: bool) { self.sess.buffer_lint_with_diagnostic( - builtin::BARE_TRAIT_OBJECT, + builtin::BARE_TRAIT_OBJECTS, id, span, "trait objects without an explicit `dyn` are deprecated", diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs index 5d7d2f0f9e69878edbc9cb2a97586098f23e2ffe..de583e81ca83185b730a07769ac94294d6e0294e 100644 --- a/src/librustc/lint/builtin.rs +++ b/src/librustc/lint/builtin.rs @@ -225,13 +225,13 @@ } declare_lint! { - pub SINGLE_USE_LIFETIME, + pub SINGLE_USE_LIFETIMES, Allow, "detects lifetime parameters that are only used once" } declare_lint! { - pub UNUSED_LIFETIME, + pub UNUSED_LIFETIMES, Allow, "detects lifetime parameters that are never used" } @@ -243,19 +243,19 @@ } declare_lint! { - pub ELIDED_LIFETIME_IN_PATH, + pub ELIDED_LIFETIMES_IN_PATHS, Allow, "hidden lifetime parameters are deprecated, try `Foo<'_>`" } declare_lint! { - pub BARE_TRAIT_OBJECT, + pub BARE_TRAIT_OBJECTS, Allow, "suggest using `dyn Trait` for trait objects" } declare_lint! { - pub ABSOLUTE_PATH_NOT_STARTING_WITH_CRATE, + pub ABSOLUTE_PATHS_NOT_STARTING_WITH_CRATE, Allow, "fully qualified paths that start with a module name \ instead of `crate`, `self`, or an extern crate name" @@ -268,7 +268,7 @@ } declare_lint! { - pub UNSTABLE_NAME_COLLISION, + pub UNSTABLE_NAME_COLLISIONS, Warn, "detects name collision with an existing but unstable method" } @@ -328,14 +328,14 @@ fn get_lints(&self) -> LintArray { DEPRECATED, UNUSED_UNSAFE, UNUSED_MUT, - SINGLE_USE_LIFETIME, - UNUSED_LIFETIME, + SINGLE_USE_LIFETIMES, + UNUSED_LIFETIMES, UNUSED_LABELS, TYVAR_BEHIND_RAW_POINTER, - ELIDED_LIFETIME_IN_PATH, - BARE_TRAIT_OBJECT, - ABSOLUTE_PATH_NOT_STARTING_WITH_CRATE, - UNSTABLE_NAME_COLLISION, + ELIDED_LIFETIMES_IN_PATHS, + BARE_TRAIT_OBJECTS, + ABSOLUTE_PATHS_NOT_STARTING_WITH_CRATE, + UNSTABLE_NAME_COLLISIONS, DUPLICATE_ASSOCIATED_TYPE_BINDINGS, ) } diff --git a/src/librustc/lint/mod.rs b/src/librustc/lint/mod.rs index 7645d3486c2f871bdf800af0047a9ad4ff8f206b..5c9f7f476864112c545311431b6d37b04bf112bb 100644 --- a/src/librustc/lint/mod.rs +++ b/src/librustc/lint/mod.rs @@ -505,7 +505,7 @@ pub fn struct_lint_level<'a>(sess: &'a Session, "this was previously accepted by the compiler but is being phased out; \ it will become a hard error"; - let explanation = if lint_id == LintId::of(::lint::builtin::UNSTABLE_NAME_COLLISION) { + let explanation = if lint_id == LintId::of(::lint::builtin::UNSTABLE_NAME_COLLISIONS) { "once this method is added to the standard library, \ the ambiguity may cause an error or change in behavior!" .to_owned() diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs index 5f150ba1e2d6f805f0a4b703efce9ec1fc875f02..966000ccd908a2454f43a916cc97a197234370e0 100644 --- a/src/librustc/middle/resolve_lifetime.rs +++ b/src/librustc/middle/resolve_lifetime.rs @@ -1344,7 +1344,7 @@ fn check_uses_for_lifetimes_defined_by_scope(&mut self) { self.tcx .struct_span_lint_node( - lint::builtin::SINGLE_USE_LIFETIME, + lint::builtin::SINGLE_USE_LIFETIMES, id, span, &format!( @@ -1366,7 +1366,7 @@ fn check_uses_for_lifetimes_defined_by_scope(&mut self) { self.tcx .struct_span_lint_node( - lint::builtin::UNUSED_LIFETIME, + lint::builtin::UNUSED_LIFETIMES, id, span, &format!( @@ -1981,7 +1981,7 @@ fn resolve_elided_lifetimes(&mut self, lifetime_refs: &'tcx [hir::Lifetime], dep if deprecated { self.tcx .struct_span_lint_node( - lint::builtin::ELIDED_LIFETIME_IN_PATH, + lint::builtin::ELIDED_LIFETIMES_IN_PATHS, id, span, &format!("hidden lifetime parameters are deprecated, try `Foo<'_>`"), diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs index 19280372d551dc676a561c2d24e168f4c6adb09f..5951fd478d89f1f3104bd5b1539838e76d26e75e 100644 --- a/src/librustc_lint/builtin.rs +++ b/src/librustc_lint/builtin.rs @@ -694,7 +694,7 @@ fn check_attribute(&mut self, cx: &EarlyContext, attr: &ast::Attribute) { } declare_lint! { - pub UNUSED_DOC_COMMENT, + pub UNUSED_DOC_COMMENTS, Warn, "detects doc comments that aren't used by rustdoc" } @@ -704,7 +704,7 @@ fn check_attribute(&mut self, cx: &EarlyContext, attr: &ast::Attribute) { impl LintPass for UnusedDocComment { fn get_lints(&self) -> LintArray { - lint_array![UNUSED_DOC_COMMENT] + lint_array![UNUSED_DOC_COMMENTS] } } @@ -713,7 +713,7 @@ fn warn_if_doc<'a, 'tcx, I: Iterator, C: LintContext<'tcx>>(&self, mut attrs: I, cx: &C) { if let Some(attr) = attrs.find(|a| a.is_value_str() && a.check_name("doc")) { - cx.struct_span_lint(UNUSED_DOC_COMMENT, attr.span, "doc comment not used by rustdoc") + cx.struct_span_lint(UNUSED_DOC_COMMENTS, attr.span, "doc comment not used by rustdoc") .emit(); } } @@ -1527,7 +1527,7 @@ fn check_item(&mut self, cx: &LateContext, it: &hir::Item) { } declare_lint! { - pub UNNECESSARY_EXTERN_CRATE, + pub UNNECESSARY_EXTERN_CRATES, Allow, "suggest removing `extern crate` for the 2018 edition" } @@ -1542,7 +1542,7 @@ pub fn new() -> Self { impl LintPass for ExternCrate { fn get_lints(&self) -> LintArray { - lint_array!(UNNECESSARY_EXTERN_CRATE) + lint_array!(UNNECESSARY_EXTERN_CRATES) } } @@ -1555,7 +1555,7 @@ fn check_item(&mut self, cx: &LateContext, it: &hir::Item) { if it.attrs.iter().any(|a| a.check_name("macro_use")) { return } - let mut err = cx.struct_span_lint(UNNECESSARY_EXTERN_CRATE, + let mut err = cx.struct_span_lint(UNNECESSARY_EXTERN_CRATES, it.span, "`extern crate` is unnecessary in the new edition"); if it.vis == hir::Visibility::Public || self.0 > 1 || orig.is_some() { let pub_ = if it.vis == hir::Visibility::Public { diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs index e35537459b70fe713b9ea8f67eea9470e71c29b9..07bb7b5276441c1df5f6ce16fb4323a5c0570cff 100644 --- a/src/librustc_lint/lib.rs +++ b/src/librustc_lint/lib.rs @@ -40,7 +40,7 @@ extern crate syntax_pos; use rustc::lint; -use rustc::lint::builtin::{BARE_TRAIT_OBJECT, ABSOLUTE_PATH_NOT_STARTING_WITH_CRATE}; +use rustc::lint::builtin::{BARE_TRAIT_OBJECTS, ABSOLUTE_PATHS_NOT_STARTING_WITH_CRATE}; use rustc::session; use rustc::util; @@ -174,7 +174,7 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) { UNUSED_ATTRIBUTES, UNUSED_MACROS, UNUSED_ALLOCATION, - UNUSED_DOC_COMMENT, + UNUSED_DOC_COMMENTS, UNUSED_EXTERN_CRATES, UNUSED_FEATURES, UNUSED_LABELS, @@ -182,9 +182,9 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) { add_lint_group!(sess, "rust_2018_idioms", - BARE_TRAIT_OBJECT, + BARE_TRAIT_OBJECTS, UNREACHABLE_PUB, - UNNECESSARY_EXTERN_CRATE); + UNNECESSARY_EXTERN_CRATES); // Guidelines for creating a future incompatibility lint: // @@ -272,14 +272,14 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) { edition: Some(Edition::Edition2018), }, FutureIncompatibleInfo { - id: LintId::of(UNSTABLE_NAME_COLLISION), + id: LintId::of(UNSTABLE_NAME_COLLISIONS), reference: "issue #48919 ", edition: None, // Note: this item represents future incompatibility of all unstable functions in the // standard library, and thus should never be removed or changed to an error. }, FutureIncompatibleInfo { - id: LintId::of(ABSOLUTE_PATH_NOT_STARTING_WITH_CRATE), + id: LintId::of(ABSOLUTE_PATHS_NOT_STARTING_WITH_CRATE), reference: "issue TBD", edition: Some(Edition::Edition2018), }, @@ -291,6 +291,11 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) { ]); // Register renamed and removed lints + store.register_renamed("single_use_lifetime", "single_use_lifetimes"); + store.register_renamed("elided_lifetime_in_path", "elided_lifetimes_in_paths"); + store.register_renamed("bare_trait_object", "bare_trait_objects"); + store.register_renamed("unstable_name_collision", "unstable_name_collisions"); + store.register_renamed("unused_doc_comment", "unused_doc_comments"); store.register_renamed("unknown_features", "unused_features"); store.register_removed("unsigned_negation", "replaced by negate_unsigned feature gate"); store.register_removed("negate_unsigned", "cast a signed value instead"); @@ -325,6 +330,4 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) { "converted into hard error, see https://github.com/rust-lang/rust/issues/48950"); store.register_removed("resolve_trait_on_defaulted_unit", "converted into hard error, see https://github.com/rust-lang/rust/issues/48950"); - store.register_removed("absolute_path_starting_with_module", - "renamed to `absolute_path_not_starting_with_crate`"); } diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index e3ed7d4d9c74443e240ef5863efc783fa44f048b..84b17f155a0e97ed2ac73a7448d71b0a1e4f3443 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -3486,7 +3486,7 @@ fn lint_path_starts_with_module(&self, id: NodeId, span: Span) { let diag = lint::builtin::BuiltinLintDiagnostics ::AbsPathWithModule(span); self.session.buffer_lint_with_diagnostic( - lint::builtin::ABSOLUTE_PATH_NOT_STARTING_WITH_CRATE, + lint::builtin::ABSOLUTE_PATHS_NOT_STARTING_WITH_CRATE, id, span, "absolute paths must start with `self`, `super`, \ `crate`, or an external crate name in the 2018 edition", diff --git a/src/librustc_typeck/check/method/probe.rs b/src/librustc_typeck/check/method/probe.rs index 6cdfb0bccc98642c3a7d509d40b74bdf04c42dfb..d129298b35b03481e32e55e90fcef81c939f1060 100644 --- a/src/librustc_typeck/check/method/probe.rs +++ b/src/librustc_typeck/check/method/probe.rs @@ -1057,7 +1057,7 @@ fn emit_unstable_name_collision_hint( unstable_candidates: &[(&Candidate<'tcx>, Symbol)], ) { let mut diag = self.tcx.struct_span_lint_node( - lint::builtin::UNSTABLE_NAME_COLLISION, + lint::builtin::UNSTABLE_NAME_COLLISIONS, self.fcx.body_id, self.span, "a method with this name may be added to the standard library in the future", 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 1b1a238a941e50dc876311c5df1795d6c49af387..76bbca606580dec4cd24843116fb156d4f6d7bd9 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 90eb66728fce5223ed263932b736b356e8e04d4e..645514971dacd64d73fc3a3385d65c508a12bc91 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-fulldeps/unnecessary-extern-crate.rs b/src/test/ui-fulldeps/unnecessary-extern-crate.rs index 0f532d3da6a7307ad1f25993bb5705ee3be751c4..fc6cb6bd053e6402c23e48870f08b308b8259eda 100644 --- a/src/test/ui-fulldeps/unnecessary-extern-crate.rs +++ b/src/test/ui-fulldeps/unnecessary-extern-crate.rs @@ -10,7 +10,7 @@ // compile-flags: --edition 2018 -#![deny(unnecessary_extern_crate)] +#![deny(unnecessary_extern_crates)] #![feature(alloc, test, libc)] extern crate alloc; diff --git a/src/test/ui-fulldeps/unnecessary-extern-crate.stderr b/src/test/ui-fulldeps/unnecessary-extern-crate.stderr index ab5457018eda66d9e0a068faa17919396fd78062..b9ccf5b19e03a50c44879f83c1fb19ad2c9e717c 100644 --- a/src/test/ui-fulldeps/unnecessary-extern-crate.stderr +++ b/src/test/ui-fulldeps/unnecessary-extern-crate.stderr @@ -7,8 +7,8 @@ LL | extern crate alloc; note: lint level defined here --> $DIR/unnecessary-extern-crate.rs:13:9 | -LL | #![deny(unnecessary_extern_crate)] - | ^^^^^^^^^^^^^^^^^^^^^^^^ +LL | #![deny(unnecessary_extern_crates)] + | ^^^^^^^^^^^^^^^^^^^^^^^^^ error: `extern crate` is unnecessary in the new edition --> $DIR/unnecessary-extern-crate.rs:19:1 diff --git a/src/test/ui/in-band-lifetimes/ellided-lifetimes.rs b/src/test/ui/in-band-lifetimes/ellided-lifetimes.rs index 5151abd68232cad8f4bec3a9b997baaf0cf3656a..3739ffe6a2648535f22c1f27fca83d3df9d744bc 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 ba58ca1ed9597f44476534158d0dadac10600264..c2bd2c261ac46df8fe9a9d76685c641d417019f1 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/inference_unstable.stderr b/src/test/ui/inference_unstable.stderr index a217bc57b367028cae9be7e8e5d30aba7e79d83a..3a5cb6f2b2e0f064a4af8b01be5c269ed472e89e 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 = help: call with fully qualified syntax `inference_unstable_itertools::IpuItertools::ipu_flatten(...)` to keep using the current method diff --git a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.fixed b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.fixed index 717abba6390a08291212a363f12d8d535b7ad6c5..279d4e9a806221741f67632fa268898de984e8d2 100644 --- a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.fixed +++ b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.fixed @@ -11,7 +11,7 @@ // run-rustfix #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] mod foo { crate trait Foo { diff --git a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.rs b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.rs index eaa09b1f751c8bc34876151fac7531d968d48914..ff290555a695c747090ea32b27c41f9762a30fd7 100644 --- a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.rs +++ b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.rs @@ -11,7 +11,7 @@ // run-rustfix #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] mod foo { crate trait Foo { diff --git a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.stderr b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.stderr index aea920342fc64016588c4c100926cefda7fbd7db..9b893f9f15cf5de1036e2ec92c6f010d24c446bf 100644 --- a/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.stderr +++ b/src/test/ui/rust-2018/edition-lint-fully-qualified-paths.stderr @@ -7,8 +7,8 @@ LL | let _: ::Bar = (); note: lint level defined here --> $DIR/edition-lint-fully-qualified-paths.rs:14:9 | -LL | #![deny(absolute_path_not_starting_with_crate)] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +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/rust-2018/edition-lint-nested-empty-paths.fixed b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.fixed index 1fc76fb657f27b8ab625d0c6e7ab66ae0302e239..929b7cd061b3eef3c2c1061b5fe26953c828090f 100644 --- a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.fixed +++ b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.fixed @@ -11,7 +11,7 @@ // run-rustfix #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] #![allow(unused_imports)] #![allow(dead_code)] diff --git a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.rs b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.rs index 8327c62d77971b169c132cd106f3d893ef624263..b5693c4bb93ad348bf34cc10aee74af65fea35a9 100644 --- a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.rs +++ b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.rs @@ -11,7 +11,7 @@ // run-rustfix #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] #![allow(unused_imports)] #![allow(dead_code)] diff --git a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.stderr b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.stderr index 82c8ef30ac37068b39b9c67850e5c134a916aa21..439db84045eb984249baad41d22d26dfc377ff2c 100644 --- a/src/test/ui/rust-2018/edition-lint-nested-empty-paths.stderr +++ b/src/test/ui/rust-2018/edition-lint-nested-empty-paths.stderr @@ -7,8 +7,8 @@ LL | use foo::{bar::{baz::{}}}; note: lint level defined here --> $DIR/edition-lint-nested-empty-paths.rs:14:9 | -LL | #![deny(absolute_path_not_starting_with_crate)] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +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/rust-2018/edition-lint-nested-paths.fixed b/src/test/ui/rust-2018/edition-lint-nested-paths.fixed index 2c14e9a982498461ae249d420b7e5510c985d5a5..06f6b6d75a700aa51eea0b67b0b206957de7e107 100644 --- a/src/test/ui/rust-2018/edition-lint-nested-paths.fixed +++ b/src/test/ui/rust-2018/edition-lint-nested-paths.fixed @@ -11,7 +11,7 @@ // run-rustfix #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] use crate::foo::{a, b}; //~^ ERROR absolute paths must start with diff --git a/src/test/ui/rust-2018/edition-lint-nested-paths.rs b/src/test/ui/rust-2018/edition-lint-nested-paths.rs index 611436b03ab1bd502b925a4b3d902e8860f294b8..c2831ec04b797ff8b6a5cadd9b51dcd126524b15 100644 --- a/src/test/ui/rust-2018/edition-lint-nested-paths.rs +++ b/src/test/ui/rust-2018/edition-lint-nested-paths.rs @@ -11,7 +11,7 @@ // run-rustfix #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] use foo::{a, b}; //~^ ERROR absolute paths must start with diff --git a/src/test/ui/rust-2018/edition-lint-nested-paths.stderr b/src/test/ui/rust-2018/edition-lint-nested-paths.stderr index 185d96690966009fda215e8bc8bc4a590442b77e..333d27c3819278e4dc1064834ad319fa8ab66402 100644 --- a/src/test/ui/rust-2018/edition-lint-nested-paths.stderr +++ b/src/test/ui/rust-2018/edition-lint-nested-paths.stderr @@ -7,8 +7,8 @@ LL | use foo::{a, b}; note: lint level defined here --> $DIR/edition-lint-nested-paths.rs:14:9 | -LL | #![deny(absolute_path_not_starting_with_crate)] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +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/rust-2018/edition-lint-paths.fixed b/src/test/ui/rust-2018/edition-lint-paths.fixed index d452ff20fda9ffc608c0729cdd408d57a7af0f63..ecc71909334091eba1be8814470cf49207d663b1 100644 --- a/src/test/ui/rust-2018/edition-lint-paths.fixed +++ b/src/test/ui/rust-2018/edition-lint-paths.fixed @@ -12,7 +12,7 @@ // run-rustfix #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] #![allow(unused)] extern crate edition_lint_paths; diff --git a/src/test/ui/rust-2018/edition-lint-paths.rs b/src/test/ui/rust-2018/edition-lint-paths.rs index 3d6d5b052bbbaf68fb82f1bfe8f83923015ad905..c08be85531d5ec42244704a1d962df0fd1b604e4 100644 --- a/src/test/ui/rust-2018/edition-lint-paths.rs +++ b/src/test/ui/rust-2018/edition-lint-paths.rs @@ -12,7 +12,7 @@ // run-rustfix #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] #![allow(unused)] extern crate edition_lint_paths; diff --git a/src/test/ui/rust-2018/edition-lint-paths.stderr b/src/test/ui/rust-2018/edition-lint-paths.stderr index 0416e51b1afcdbc94f5234549f20184f24d85afe..37c9041b724c766413bc2617beda883b81967207 100644 --- a/src/test/ui/rust-2018/edition-lint-paths.stderr +++ b/src/test/ui/rust-2018/edition-lint-paths.stderr @@ -7,8 +7,8 @@ LL | use ::bar::Bar; note: lint level defined here --> $DIR/edition-lint-paths.rs:15:9 | -LL | #![deny(absolute_path_not_starting_with_crate)] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +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/rust-2018/extern-crate-idiomatic.fixed b/src/test/ui/rust-2018/extern-crate-idiomatic.fixed index fd0522f645264cc63934e5f127f0052f7c04a738..a874a62220298c7f81c4c051f09aa2daffcd714d 100644 --- a/src/test/ui/rust-2018/extern-crate-idiomatic.fixed +++ b/src/test/ui/rust-2018/extern-crate-idiomatic.fixed @@ -16,7 +16,7 @@ // but we don't. #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] extern crate edition_lint_paths; diff --git a/src/test/ui/rust-2018/extern-crate-idiomatic.rs b/src/test/ui/rust-2018/extern-crate-idiomatic.rs index fd0522f645264cc63934e5f127f0052f7c04a738..a874a62220298c7f81c4c051f09aa2daffcd714d 100644 --- a/src/test/ui/rust-2018/extern-crate-idiomatic.rs +++ b/src/test/ui/rust-2018/extern-crate-idiomatic.rs @@ -16,7 +16,7 @@ // but we don't. #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] extern crate edition_lint_paths; diff --git a/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.fixed b/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.fixed index 7be5c1fc6b96c3c31996b90ce764ab6e2620cffd..6f38978ae8ac616ffdb9019abe62ad7a9960300c 100644 --- a/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.fixed +++ b/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.fixed @@ -17,7 +17,7 @@ // we can't drop the extern crate. #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] extern crate edition_lint_paths; use self::edition_lint_paths::foo; diff --git a/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.rs b/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.rs index 7be5c1fc6b96c3c31996b90ce764ab6e2620cffd..6f38978ae8ac616ffdb9019abe62ad7a9960300c 100644 --- a/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.rs +++ b/src/test/ui/rust-2018/extern-crate-referenced-by-self-path.rs @@ -17,7 +17,7 @@ // we can't drop the extern crate. #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] extern crate edition_lint_paths; use self::edition_lint_paths::foo; diff --git a/src/test/ui/rust-2018/extern-crate-rename.fixed b/src/test/ui/rust-2018/extern-crate-rename.fixed index 0b17d6e3968d776ea68da085444a592b706c353e..e54fe1966e056b91d8877285827befd3817aad79 100644 --- a/src/test/ui/rust-2018/extern-crate-rename.fixed +++ b/src/test/ui/rust-2018/extern-crate-rename.fixed @@ -15,7 +15,7 @@ // paths. We don't (and we leave the `extern crate` in place). #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] extern crate edition_lint_paths as my_crate; diff --git a/src/test/ui/rust-2018/extern-crate-rename.rs b/src/test/ui/rust-2018/extern-crate-rename.rs index 53ea7c84415e8c2dfb9c4208562bb06ab6baa646..549f8efb7a472b8b9c4c5c6a9fa8e3f0b5302748 100644 --- a/src/test/ui/rust-2018/extern-crate-rename.rs +++ b/src/test/ui/rust-2018/extern-crate-rename.rs @@ -15,7 +15,7 @@ // paths. We don't (and we leave the `extern crate` in place). #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] extern crate edition_lint_paths as my_crate; diff --git a/src/test/ui/rust-2018/extern-crate-rename.stderr b/src/test/ui/rust-2018/extern-crate-rename.stderr index 9f18ddd5f50acb62b934b2a8ddf0ee61838de47e..d739ad360ed7b399c1618c538dd3c192071cb8a9 100644 --- a/src/test/ui/rust-2018/extern-crate-rename.stderr +++ b/src/test/ui/rust-2018/extern-crate-rename.stderr @@ -7,8 +7,8 @@ LL | use my_crate::foo; note: lint level defined here --> $DIR/extern-crate-rename.rs:18:9 | -LL | #![deny(absolute_path_not_starting_with_crate)] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +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/rust-2018/extern-crate-submod.fixed b/src/test/ui/rust-2018/extern-crate-submod.fixed index eec6dbdaa3925ab0d126adcf6ef05b1884ce5775..5d36c12103ab1a36dc0db1a7d63d89e407338e4c 100644 --- a/src/test/ui/rust-2018/extern-crate-submod.fixed +++ b/src/test/ui/rust-2018/extern-crate-submod.fixed @@ -16,7 +16,7 @@ // place). #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] mod m { // Because this extern crate does not appear at the root, we diff --git a/src/test/ui/rust-2018/extern-crate-submod.rs b/src/test/ui/rust-2018/extern-crate-submod.rs index 281624170d16d7228f15eb36868a47b51d5f18e8..5951e12d545f57aae37fb0c199b80f7cb0bfbe32 100644 --- a/src/test/ui/rust-2018/extern-crate-submod.rs +++ b/src/test/ui/rust-2018/extern-crate-submod.rs @@ -16,7 +16,7 @@ // place). #![feature(rust_2018_preview)] -#![deny(absolute_path_not_starting_with_crate)] +#![deny(absolute_paths_not_starting_with_crate)] mod m { // Because this extern crate does not appear at the root, we diff --git a/src/test/ui/rust-2018/extern-crate-submod.stderr b/src/test/ui/rust-2018/extern-crate-submod.stderr index 13e90aca046f2da7eba4c65d551f2197d7d3cf01..17da9feaeab7beae183e8367fa9016e9d30fbe29 100644 --- a/src/test/ui/rust-2018/extern-crate-submod.stderr +++ b/src/test/ui/rust-2018/extern-crate-submod.stderr @@ -7,8 +7,8 @@ LL | use m::edition_lint_paths::foo; note: lint level defined here --> $DIR/extern-crate-submod.rs:19:9 | -LL | #![deny(absolute_path_not_starting_with_crate)] - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +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/single-use-lifetime/fn-types.rs b/src/test/ui/single-use-lifetime/fn-types.rs index c5d98d260484442f4ac4612024f06cc743c7f3e6..53fb4cf21f5ec90085529e1f76ae4ee124aa521e 100644 --- a/src/test/ui/single-use-lifetime/fn-types.rs +++ b/src/test/ui/single-use-lifetime/fn-types.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![deny(single_use_lifetime)] +#![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/fn-types.stderr b/src/test/ui/single-use-lifetime/fn-types.stderr index bec712b004c3dced67f6183b1b930e3e1b94e211..6b8417bf9db6d8b131ff6479fdb787b195f20f2e 100644 --- a/src/test/ui/single-use-lifetime/fn-types.stderr +++ b/src/test/ui/single-use-lifetime/fn-types.stderr @@ -7,8 +7,8 @@ LL | a: for<'a> fn(&'a u32), //~ ERROR `'a` only used once note: lint level defined here --> $DIR/fn-types.rs:11:9 | -LL | #![deny(single_use_lifetime)] - | ^^^^^^^^^^^^^^^^^^^ +LL | #![deny(single_use_lifetimes)] + | ^^^^^^^^^^^^^^^^^^^^ error[E0581]: return type references lifetime `'a`, which is not constrained by the fn input types --> $DIR/fn-types.rs:22:22 diff --git a/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.rs b/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.rs index 9001a8de29a4353f4a2bcd4cd1e6da82c3b6a305..1aad3265cbe0af54f541d7d5f7a5607b199ef258 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.rs @@ -9,7 +9,7 @@ // except according to those terms. #![feature(in_band_lifetimes)] -#![deny(single_use_lifetime)] +#![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.stderr b/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.stderr index 2011359a5112034ea6cb2ff6ca2aa4046079389d..3694c2452f34c0ecb810728cea63d099a5a2c4fe 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.stderr +++ b/src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.stderr @@ -7,8 +7,8 @@ LL | fn a(x: &'a u32, y: &'b u32) { note: lint level defined here --> $DIR/one-use-in-fn-argument-in-band.rs:12:9 | -LL | #![deny(single_use_lifetime)] - | ^^^^^^^^^^^^^^^^^^^ +LL | #![deny(single_use_lifetimes)] + | ^^^^^^^^^^^^^^^^^^^^ error: lifetime parameter `'a` only used once --> $DIR/one-use-in-fn-argument-in-band.rs:19:10 diff --git a/src/test/ui/single-use-lifetime/one-use-in-fn-argument.rs b/src/test/ui/single-use-lifetime/one-use-in-fn-argument.rs index 2a9e80d56c31b045e921e1678eeac03a0b6567e8..9ac813a24ded3cb07597e11a388ee41a071eabab 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-fn-argument.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-fn-argument.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![deny(single_use_lifetime)] +#![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/one-use-in-fn-argument.stderr b/src/test/ui/single-use-lifetime/one-use-in-fn-argument.stderr index e9a3570b3fb4dfce568c127cafa989b416bcf52a..f1304568fe72cb6a32b32642191eb77cd8cc3ab4 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-fn-argument.stderr +++ b/src/test/ui/single-use-lifetime/one-use-in-fn-argument.stderr @@ -7,8 +7,8 @@ LL | fn a<'a>(x: &'a u32) { //~ ERROR `'a` only used once note: lint level defined here --> $DIR/one-use-in-fn-argument.rs:11:9 | -LL | #![deny(single_use_lifetime)] - | ^^^^^^^^^^^^^^^^^^^ +LL | #![deny(single_use_lifetimes)] + | ^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/single-use-lifetime/one-use-in-fn-return.rs b/src/test/ui/single-use-lifetime/one-use-in-fn-return.rs index d024094ae7122416f973cacaecb21cd08c022afe..23275e47b5e2857246ade8ee76ee1afa521ea897 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-fn-return.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-fn-return.rs @@ -10,7 +10,7 @@ // compile-pass -#![deny(single_use_lifetime)] +#![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.rs b/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.rs index 9cdad09e33d4e7104d6e362e31ee640e22377a0e..a862bbbe30c09e4ebb32e45e27fd6c830e4ab0ed 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![deny(single_use_lifetime)] +#![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr b/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr index 1718f19318819907d0b3dbbc7addf16b4a97cbcf..8f91ca0ce54c32a27899ea479c1725c7c614faa2 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr +++ b/src/test/ui/single-use-lifetime/one-use-in-inherent-impl-header.stderr @@ -7,8 +7,8 @@ LL | impl<'f> Foo<'f> { //~ ERROR `'f` only used once note: lint level defined here --> $DIR/one-use-in-inherent-impl-header.rs:11:9 | -LL | #![deny(single_use_lifetime)] - | ^^^^^^^^^^^^^^^^^^^ +LL | #![deny(single_use_lifetimes)] + | ^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.rs b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.rs index 1ca078cdb3bbbc475748db2e734b6b0fd87d785b..863d8faef6ea17ea964a091408dd4014840a4519 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![deny(single_use_lifetime)] +#![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr index 38e90e76f56e2e0c15b58829bd5b91067cd90f25..4811a65ced91975849b5ffc96f30fd4cfb301f4a 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr +++ b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-argument.stderr @@ -7,8 +7,8 @@ LL | fn inherent_a<'a>(&self, data: &'a u32) { //~ ERROR `'a` only used once note: lint level defined here --> $DIR/one-use-in-inherent-method-argument.rs:11:9 | -LL | #![deny(single_use_lifetime)] - | ^^^^^^^^^^^^^^^^^^^ +LL | #![deny(single_use_lifetimes)] + | ^^^^^^^^^^^^^^^^^^^^ error: lifetime parameter `'f` only used once --> $DIR/one-use-in-inherent-method-argument.rs:21:6 diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.rs b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.rs index 7d2ffa379adc48a2d5b8229f57c777460228ec93..92e4ff3436b044024eb3d34792d2e8626b2e3c87 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![deny(single_use_lifetime)] +#![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr index 32fd284949e965a28af8f60c43e4d37f8cf17184..b552c8475d8900800ddabc0a77f1581c6277325e 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr +++ b/src/test/ui/single-use-lifetime/one-use-in-inherent-method-return.stderr @@ -7,8 +7,8 @@ LL | impl<'f> Foo<'f> { //~ ERROR `'f` only used once note: lint level defined here --> $DIR/one-use-in-inherent-method-return.rs:11:9 | -LL | #![deny(single_use_lifetime)] - | ^^^^^^^^^^^^^^^^^^^ +LL | #![deny(single_use_lifetimes)] + | ^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/single-use-lifetime/one-use-in-struct.rs b/src/test/ui/single-use-lifetime/one-use-in-struct.rs index 5c758d9db07877f464c0d26c876246c6a45151d8..1e1426c145b11d773507d830d46a3892ab5a9f94 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-struct.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-struct.rs @@ -14,7 +14,7 @@ // // compile-pass -#![deny(single_use_lifetime)] +#![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.rs b/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.rs index 99e9eaf98ad1f40a14878b5f98901c348ddda7f2..389ba5c873ad8e3681a794f5c8d92dd2392de90d 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.rs +++ b/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.rs @@ -11,7 +11,7 @@ // Test that we DO warn for a lifetime on an impl used only in `&self` // in a trait method. -#![deny(single_use_lifetime)] +#![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr b/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr index e5278671a1afa0fd7eac66df4b35ee9b272b5e04..de74800ff60140a2aa97b15e241d6f804dd27b0e 100644 --- a/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr +++ b/src/test/ui/single-use-lifetime/one-use-in-trait-method-argument.stderr @@ -7,8 +7,8 @@ LL | fn next<'g>(&'g mut self) -> Option { //~ ERROR `'g` only u note: lint level defined here --> $DIR/one-use-in-trait-method-argument.rs:14:9 | -LL | #![deny(single_use_lifetime)] - | ^^^^^^^^^^^^^^^^^^^ +LL | #![deny(single_use_lifetimes)] + | ^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/single-use-lifetime/two-uses-in-fn-argument-and-return.rs b/src/test/ui/single-use-lifetime/two-uses-in-fn-argument-and-return.rs index d210be4ba2a509f4b512c3b2b085136c1f9f9b51..a6183e3d5c8e1b53fa84a340c95842692b472f05 100644 --- a/src/test/ui/single-use-lifetime/two-uses-in-fn-argument-and-return.rs +++ b/src/test/ui/single-use-lifetime/two-uses-in-fn-argument-and-return.rs @@ -13,7 +13,7 @@ // // compile-pass -#![deny(single_use_lifetime)] +#![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/two-uses-in-fn-arguments.rs b/src/test/ui/single-use-lifetime/two-uses-in-fn-arguments.rs index f43a3e116efe57461e10a6e40698e03fd6ba7a2e..4706b9cbb092c21fa3323368b22a429484316cb6 100644 --- a/src/test/ui/single-use-lifetime/two-uses-in-fn-arguments.rs +++ b/src/test/ui/single-use-lifetime/two-uses-in-fn-arguments.rs @@ -13,7 +13,7 @@ // // compile-pass -#![deny(single_use_lifetime)] +#![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/two-uses-in-inherent-impl-header.rs b/src/test/ui/single-use-lifetime/two-uses-in-inherent-impl-header.rs index d224d9fefa10615336e85a4163dcffc2dd7813d1..ca5c519e05a16b3b75039c79180aa681c143a834 100644 --- a/src/test/ui/single-use-lifetime/two-uses-in-inherent-impl-header.rs +++ b/src/test/ui/single-use-lifetime/two-uses-in-inherent-impl-header.rs @@ -12,7 +12,7 @@ // // compile-pass -#![deny(single_use_lifetime)] +#![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.rs b/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.rs index 7b69a6f0d525076a5f304f909cf4036c4c50e3fc..9345fe59d9449f54f6470db2385a455b4ed1d2bd 100644 --- a/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.rs +++ b/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.rs @@ -11,7 +11,7 @@ // Test that we DO NOT warn for a lifetime used twice in an impl method and // header. -#![deny(single_use_lifetime)] +#![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr b/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr index 6fc66611b1ddfb5f53e479f417aa0d6cf8344ca0..ca0b050b696793dca7c44879adc245fcf3ed885a 100644 --- a/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr +++ b/src/test/ui/single-use-lifetime/two-uses-in-inherent-method-argument-and-return.stderr @@ -7,8 +7,8 @@ LL | impl<'f> Foo<'f> { //~ ERROR `'f` only used once note: lint level defined here --> $DIR/two-uses-in-inherent-method-argument-and-return.rs:14:9 | -LL | #![deny(single_use_lifetime)] - | ^^^^^^^^^^^^^^^^^^^ +LL | #![deny(single_use_lifetimes)] + | ^^^^^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/single-use-lifetime/two-uses-in-trait-impl.rs b/src/test/ui/single-use-lifetime/two-uses-in-trait-impl.rs index ffba3d8527d0e9ae9d9d5afa447251effec6ba77..c298c958ef0f90e54b7a55a84dbec25c9b5cec6b 100644 --- a/src/test/ui/single-use-lifetime/two-uses-in-trait-impl.rs +++ b/src/test/ui/single-use-lifetime/two-uses-in-trait-impl.rs @@ -13,7 +13,7 @@ // // compile-pass -#![deny(single_use_lifetime)] +#![deny(single_use_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/zero-uses-in-fn.rs b/src/test/ui/single-use-lifetime/zero-uses-in-fn.rs index b71b189833a72d750c3e838d1aaa7be7ca8676e2..7152d122f79a351b54c2a5df2972a095d37c49a1 100644 --- a/src/test/ui/single-use-lifetime/zero-uses-in-fn.rs +++ b/src/test/ui/single-use-lifetime/zero-uses-in-fn.rs @@ -10,7 +10,7 @@ // Test that we DO warn when lifetime name is not used at all. -#![deny(unused_lifetime)] +#![deny(unused_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/zero-uses-in-fn.stderr b/src/test/ui/single-use-lifetime/zero-uses-in-fn.stderr index f1cdc6e495aa79b890918a391aea2bea1ec56b29..322351a0a8e5b4485e1b691cbca7a27444d22d25 100644 --- a/src/test/ui/single-use-lifetime/zero-uses-in-fn.stderr +++ b/src/test/ui/single-use-lifetime/zero-uses-in-fn.stderr @@ -7,8 +7,8 @@ LL | fn d<'a>() { } //~ ERROR `'a` never used note: lint level defined here --> $DIR/zero-uses-in-fn.rs:13:9 | -LL | #![deny(unused_lifetime)] - | ^^^^^^^^^^^^^^^ +LL | #![deny(unused_lifetimes)] + | ^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/single-use-lifetime/zero-uses-in-impl.rs b/src/test/ui/single-use-lifetime/zero-uses-in-impl.rs index 6a09727015fa264992ec2a967e688f9a707d2949..a231c0bf003311ca348746f9481cda5ad78b9578 100644 --- a/src/test/ui/single-use-lifetime/zero-uses-in-impl.rs +++ b/src/test/ui/single-use-lifetime/zero-uses-in-impl.rs @@ -10,7 +10,7 @@ // Test that we DO warn when lifetime name is not used at all. -#![deny(unused_lifetime)] +#![deny(unused_lifetimes)] #![allow(dead_code)] #![allow(unused_variables)] diff --git a/src/test/ui/single-use-lifetime/zero-uses-in-impl.stderr b/src/test/ui/single-use-lifetime/zero-uses-in-impl.stderr index d2dd26e68a289441e123fd5d0b5e8895e3db3b2f..34cb15c1339d8837c7b842fb95f58157b8a989b6 100644 --- a/src/test/ui/single-use-lifetime/zero-uses-in-impl.stderr +++ b/src/test/ui/single-use-lifetime/zero-uses-in-impl.stderr @@ -7,8 +7,8 @@ LL | impl<'a> Foo { } //~ ERROR `'a` never used note: lint level defined here --> $DIR/zero-uses-in-impl.rs:13:9 | -LL | #![deny(unused_lifetime)] - | ^^^^^^^^^^^^^^^ +LL | #![deny(unused_lifetimes)] + | ^^^^^^^^^^^^^^^^ error: aborting due to previous error diff --git a/src/test/ui/suggestions/removing-extern-crate.stderr b/src/test/ui/suggestions/removing-extern-crate.stderr index 317703d0caa521d622b981a4090bdb19e777fbe3..39d22de02776c915dab94cd6ce9e5f5f62876270 100644 --- a/src/test/ui/suggestions/removing-extern-crate.stderr +++ b/src/test/ui/suggestions/removing-extern-crate.stderr @@ -9,7 +9,7 @@ note: lint level defined here | LL | #![warn(rust_2018_idioms)] | ^^^^^^^^^^^^^^^^ - = note: #[warn(unnecessary_extern_crate)] implied by #[warn(rust_2018_idioms)] + = note: #[warn(unnecessary_extern_crates)] implied by #[warn(rust_2018_idioms)] warning: `extern crate` is unnecessary in the new edition --> $DIR/removing-extern-crate.rs:20:1