From 84dfb2c4d7570fad03101bf4931000d029ec3419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20K=C3=BCber?= Date: Fri, 12 Jul 2019 19:33:51 -0700 Subject: [PATCH 1/2] Tweak wording in feature gate errors --- src/librustc_resolve/macros.rs | 2 +- src/libsyntax/feature_gate.rs | 6 ++-- src/test/ui/attributes/obsolete-attr.stderr | 4 +-- src/test/ui/attributes/unknown-attr.stderr | 6 ++-- ...r-unknown-attribute-macro-expansion.stderr | 2 +- .../cfg-generic-params.stderr | 10 +++--- src/test/ui/custom_attribute.rs | 6 ++-- src/test/ui/custom_attribute.stderr | 6 ++-- .../feature-gate-custom_attribute.stderr | 26 +++++++------- .../feature-gate-custom_attribute2.rs | 34 +++++++++---------- .../feature-gate-custom_attribute2.stderr | 34 +++++++++---------- .../feature-gates/feature-gate-may-dangle.rs | 2 +- .../feature-gate-may-dangle.stderr | 2 +- .../feature-gate-rustc-attrs.stderr | 2 +- src/test/ui/issues/issue-32655.stderr | 4 +-- src/test/ui/issues/issue-49074.rs | 2 +- src/test/ui/issues/issue-49074.stderr | 2 +- .../ui/macros/macro-reexport-removed.stderr | 2 +- .../proc-macro/derive-helper-shadowing.stderr | 2 +- .../ui/proc-macro/derive-still-gated.stderr | 2 +- .../ui/proc-macro/expand-to-unstable-2.stderr | 2 +- src/test/ui/proc-macro/issue-41211.stderr | 2 +- .../macro-namespace-reserved-2.stderr | 2 +- .../proc-macro/proc-macro-attributes.stderr | 2 +- .../ui/proc-macro/proc-macro-gates2.stderr | 4 +-- src/test/ui/proc-macro/resolve-error.stderr | 4 +-- .../ui/reserved/reserved-attr-on-macro.stderr | 2 +- .../param-attrs-builtin-attrs.rs | 16 ++++----- .../param-attrs-builtin-attrs.stderr | 16 ++++----- src/test/ui/span/issue-36530.stderr | 4 +-- .../ui/suggestions/attribute-typos.stderr | 6 ++-- .../tool-attributes-misplaced-1.stderr | 2 +- 32 files changed, 109 insertions(+), 109 deletions(-) diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs index fc1becfe30960..7f25d81982a64 100644 --- a/src/librustc_resolve/macros.rs +++ b/src/librustc_resolve/macros.rs @@ -328,7 +328,7 @@ impl<'a> Resolver<'a> { if attr_kind == NonMacroAttrKind::Custom { assert!(path.segments.len() == 1); if !features.custom_attribute { - let msg = format!("The attribute `{}` is currently unknown to the \ + let msg = format!("the attribute `{}` is currently unknown to the \ compiler and may have meaning added to it in the \ future", path); self.report_unknown_attribute( diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index e3628d908fb1e..ed7d6c35fb97a 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -1451,7 +1451,7 @@ pub const BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[ template!(Word), Gated(Stability::Unstable, sym::dropck_eyepatch, - "may_dangle has unstable semantics and may be removed in the future", + "`may_dangle` has unstable semantics and may be removed in the future", cfg_fn!(dropck_eyepatch))), (sym::unwind, Whitelisted, template!(List: "allowed|aborts"), Gated(Stability::Unstable, sym::unwind_attributes, @@ -1693,8 +1693,8 @@ impl<'a> Context<'a> { // Only run the custom attribute lint during regular feature gate // checking. Macro gating runs before the plugin attributes are // registered, so we skip this in that case. - let msg = format!("The attribute `{}` is currently unknown to the compiler and \ - may have meaning added to it in the future", attr.path); + let msg = format!("the attribute `{}` is currently unknown to the compiler and \ + may have meaning added to it in the future", attr.path); gate_feature!(self, custom_attribute, attr.span, &msg); } } diff --git a/src/test/ui/attributes/obsolete-attr.stderr b/src/test/ui/attributes/obsolete-attr.stderr index 6021700dfbb1d..1d5caa81a5049 100644 --- a/src/test/ui/attributes/obsolete-attr.stderr +++ b/src/test/ui/attributes/obsolete-attr.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `fixed_stack_segment` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `fixed_stack_segment` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/obsolete-attr.rs:5:3 | LL | #[fixed_stack_segment] fn f() {} @@ -7,7 +7,7 @@ LL | #[fixed_stack_segment] fn f() {} = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `ab_isize` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `ab_isize` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/obsolete-attr.rs:3:3 | LL | #[ab_isize="stdcall"] extern {} diff --git a/src/test/ui/attributes/unknown-attr.stderr b/src/test/ui/attributes/unknown-attr.stderr index b46db5662932c..19e0e0a6b6303 100644 --- a/src/test/ui/attributes/unknown-attr.stderr +++ b/src/test/ui/attributes/unknown-attr.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `mutable_doc` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `mutable_doc` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/unknown-attr.rs:5:4 | LL | #![mutable_doc] @@ -7,7 +7,7 @@ LL | #![mutable_doc] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `dance` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `dance` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/unknown-attr.rs:7:3 | LL | #[dance] mod a {} @@ -16,7 +16,7 @@ LL | #[dance] mod a {} = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `dance` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `dance` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/unknown-attr.rs:9:3 | LL | #[dance] fn main() {} diff --git a/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr b/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr index cf4d0fc5ad07f..199227c048151 100644 --- a/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr +++ b/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/cfg-attr-unknown-attribute-macro-expansion.rs:3:27 | LL | #[cfg_attr(all(), unknown)] diff --git a/src/test/ui/conditional-compilation/cfg-generic-params.stderr b/src/test/ui/conditional-compilation/cfg-generic-params.stderr index b73d7da30b8ac..1f9731fcfbefb 100644 --- a/src/test/ui/conditional-compilation/cfg-generic-params.stderr +++ b/src/test/ui/conditional-compilation/cfg-generic-params.stderr @@ -16,7 +16,7 @@ error: only lifetime parameters can be used in this context LL | struct WhereBad where for<#[cfg(no)] 'a, #[cfg(yes)] T> u8: Copy; | ^ -error[E0658]: The attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/cfg-generic-params.rs:19:29 | LL | fn f_lt_yes<#[cfg_attr(yes, unknown)] 'a>() {} @@ -25,7 +25,7 @@ LL | fn f_lt_yes<#[cfg_attr(yes, unknown)] 'a>() {} = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/cfg-generic-params.rs:21:29 | LL | fn f_ty_yes<#[cfg_attr(yes, unknown)] T>() {} @@ -34,7 +34,7 @@ LL | fn f_ty_yes<#[cfg_attr(yes, unknown)] T>() {} = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/cfg-generic-params.rs:24:34 | LL | type FnYes = for<#[cfg_attr(yes, unknown)] 'a> fn(); @@ -43,7 +43,7 @@ LL | type FnYes = for<#[cfg_attr(yes, unknown)] 'a> fn(); = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/cfg-generic-params.rs:28:40 | LL | type PolyYes = dyn for<#[cfg_attr(yes, unknown)] 'a> Copy; @@ -52,7 +52,7 @@ LL | type PolyYes = dyn for<#[cfg_attr(yes, unknown)] 'a> Copy; = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/cfg-generic-params.rs:32:43 | LL | struct WhereYes where for<#[cfg_attr(yes, unknown)] 'a> u8: Copy; diff --git a/src/test/ui/custom_attribute.rs b/src/test/ui/custom_attribute.rs index 9cb43ab07ad6d..37834c0206137 100644 --- a/src/test/ui/custom_attribute.rs +++ b/src/test/ui/custom_attribute.rs @@ -1,9 +1,9 @@ #![feature(stmt_expr_attributes)] -#[foo] //~ ERROR The attribute `foo` +#[foo] //~ ERROR the attribute `foo` fn main() { - #[foo] //~ ERROR The attribute `foo` + #[foo] //~ ERROR the attribute `foo` let x = (); - #[foo] //~ ERROR The attribute `foo` + #[foo] //~ ERROR the attribute `foo` x } diff --git a/src/test/ui/custom_attribute.stderr b/src/test/ui/custom_attribute.stderr index 84c4e33e55a1a..e273c064ac41c 100644 --- a/src/test/ui/custom_attribute.stderr +++ b/src/test/ui/custom_attribute.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/custom_attribute.rs:3:3 | LL | #[foo] @@ -7,7 +7,7 @@ LL | #[foo] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/custom_attribute.rs:5:7 | LL | #[foo] @@ -16,7 +16,7 @@ LL | #[foo] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/custom_attribute.rs:7:7 | LL | #[foo] diff --git a/src/test/ui/feature-gates/feature-gate-custom_attribute.stderr b/src/test/ui/feature-gates/feature-gate-custom_attribute.stderr index 12175feadd63a..11619a5dbd83f 100644 --- a/src/test/ui/feature-gates/feature-gate-custom_attribute.stderr +++ b/src/test/ui/feature-gates/feature-gate-custom_attribute.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:7:3 | LL | #[fake_attr] @@ -7,7 +7,7 @@ LL | #[fake_attr] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:8:3 | LL | #[fake_attr(100)] @@ -16,7 +16,7 @@ LL | #[fake_attr(100)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:9:3 | LL | #[fake_attr(1, 2, 3)] @@ -25,7 +25,7 @@ LL | #[fake_attr(1, 2, 3)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:10:3 | LL | #[fake_attr("hello")] @@ -34,7 +34,7 @@ LL | #[fake_attr("hello")] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:11:3 | LL | #[fake_attr(name = "hello")] @@ -43,7 +43,7 @@ LL | #[fake_attr(name = "hello")] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:12:3 | LL | #[fake_attr(1, "hi", key = 12, true, false)] @@ -52,7 +52,7 @@ LL | #[fake_attr(1, "hi", key = 12, true, false)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:13:3 | LL | #[fake_attr(key = "hello", val = 10)] @@ -61,7 +61,7 @@ LL | #[fake_attr(key = "hello", val = 10)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:14:3 | LL | #[fake_attr(key("hello"), val(10))] @@ -70,7 +70,7 @@ LL | #[fake_attr(key("hello"), val(10))] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:15:3 | LL | #[fake_attr(enabled = true, disabled = false)] @@ -79,7 +79,7 @@ LL | #[fake_attr(enabled = true, disabled = false)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:16:3 | LL | #[fake_attr(true)] @@ -88,7 +88,7 @@ LL | #[fake_attr(true)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:17:3 | LL | #[fake_attr(pi = 3.14159)] @@ -97,7 +97,7 @@ LL | #[fake_attr(pi = 3.14159)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:18:3 | LL | #[fake_attr(b"hi")] @@ -106,7 +106,7 @@ LL | #[fake_attr(b"hi")] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `fake_doc` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `fake_doc` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:19:3 | LL | #[fake_doc(r"doc")] diff --git a/src/test/ui/feature-gates/feature-gate-custom_attribute2.rs b/src/test/ui/feature-gates/feature-gate-custom_attribute2.rs index 2137a2a003adf..8fe11cb02a021 100644 --- a/src/test/ui/feature-gates/feature-gate-custom_attribute2.rs +++ b/src/test/ui/feature-gates/feature-gate-custom_attribute2.rs @@ -4,54 +4,54 @@ // gate-test-custom_attribute struct StLt<#[lt_struct] 'a>(&'a u32); -//~^ ERROR The attribute `lt_struct` is currently unknown to the compiler +//~^ ERROR the attribute `lt_struct` is currently unknown to the compiler struct StTy<#[ty_struct] I>(I); -//~^ ERROR The attribute `ty_struct` is currently unknown to the compiler +//~^ ERROR the attribute `ty_struct` is currently unknown to the compiler enum EnLt<#[lt_enum] 'b> { A(&'b u32), B } -//~^ ERROR The attribute `lt_enum` is currently unknown to the compiler +//~^ ERROR the attribute `lt_enum` is currently unknown to the compiler enum EnTy<#[ty_enum] J> { A(J), B } -//~^ ERROR The attribute `ty_enum` is currently unknown to the compiler +//~^ ERROR the attribute `ty_enum` is currently unknown to the compiler trait TrLt<#[lt_trait] 'c> { fn foo(&self, _: &'c [u32]) -> &'c u32; } -//~^ ERROR The attribute `lt_trait` is currently unknown to the compiler +//~^ ERROR the attribute `lt_trait` is currently unknown to the compiler trait TrTy<#[ty_trait] K> { fn foo(&self, _: K); } -//~^ ERROR The attribute `ty_trait` is currently unknown to the compiler +//~^ ERROR the attribute `ty_trait` is currently unknown to the compiler type TyLt<#[lt_type] 'd> = &'d u32; -//~^ ERROR The attribute `lt_type` is currently unknown to the compiler +//~^ ERROR the attribute `lt_type` is currently unknown to the compiler type TyTy<#[ty_type] L> = (L, ); -//~^ ERROR The attribute `ty_type` is currently unknown to the compiler +//~^ ERROR the attribute `ty_type` is currently unknown to the compiler impl<#[lt_inherent] 'e> StLt<'e> { } -//~^ ERROR The attribute `lt_inherent` is currently unknown to the compiler +//~^ ERROR the attribute `lt_inherent` is currently unknown to the compiler impl<#[ty_inherent] M> StTy { } -//~^ ERROR The attribute `ty_inherent` is currently unknown to the compiler +//~^ ERROR the attribute `ty_inherent` is currently unknown to the compiler impl<#[lt_impl_for] 'f> TrLt<'f> for StLt<'f> { - //~^ ERROR The attribute `lt_impl_for` is currently unknown to the compiler + //~^ ERROR the attribute `lt_impl_for` is currently unknown to the compiler fn foo(&self, _: &'f [u32]) -> &'f u32 { loop { } } } impl<#[ty_impl_for] N> TrTy for StTy { - //~^ ERROR The attribute `ty_impl_for` is currently unknown to the compiler + //~^ ERROR the attribute `ty_impl_for` is currently unknown to the compiler fn foo(&self, _: N) { } } fn f_lt<#[lt_fn] 'g>(_: &'g [u32]) -> &'g u32 { loop { } } -//~^ ERROR The attribute `lt_fn` is currently unknown to the compiler +//~^ ERROR the attribute `lt_fn` is currently unknown to the compiler fn f_ty<#[ty_fn] O>(_: O) { } -//~^ ERROR The attribute `ty_fn` is currently unknown to the compiler +//~^ ERROR the attribute `ty_fn` is currently unknown to the compiler impl StTy { fn m_lt<#[lt_meth] 'h>(_: &'h [u32]) -> &'h u32 { loop { } } - //~^ ERROR The attribute `lt_meth` is currently unknown to the compiler + //~^ ERROR the attribute `lt_meth` is currently unknown to the compiler fn m_ty<#[ty_meth] P>(_: P) { } - //~^ ERROR The attribute `ty_meth` is currently unknown to the compiler + //~^ ERROR the attribute `ty_meth` is currently unknown to the compiler } fn hof_lt(_: Q) where Q: for <#[lt_hof] 'i> Fn(&'i [u32]) -> &'i u32 - //~^ ERROR The attribute `lt_hof` is currently unknown to the compiler + //~^ ERROR the attribute `lt_hof` is currently unknown to the compiler { } diff --git a/src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr b/src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr index f159308dcb829..15e0c41b90637 100644 --- a/src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr +++ b/src/test/ui/feature-gates/feature-gate-custom_attribute2.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `lt_struct` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `lt_struct` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:6:13 | LL | struct StLt<#[lt_struct] 'a>(&'a u32); @@ -7,7 +7,7 @@ LL | struct StLt<#[lt_struct] 'a>(&'a u32); = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `ty_struct` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `ty_struct` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:8:13 | LL | struct StTy<#[ty_struct] I>(I); @@ -16,7 +16,7 @@ LL | struct StTy<#[ty_struct] I>(I); = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `lt_enum` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `lt_enum` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:11:11 | LL | enum EnLt<#[lt_enum] 'b> { A(&'b u32), B } @@ -25,7 +25,7 @@ LL | enum EnLt<#[lt_enum] 'b> { A(&'b u32), B } = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `ty_enum` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `ty_enum` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:13:11 | LL | enum EnTy<#[ty_enum] J> { A(J), B } @@ -34,7 +34,7 @@ LL | enum EnTy<#[ty_enum] J> { A(J), B } = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `lt_trait` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `lt_trait` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:16:12 | LL | trait TrLt<#[lt_trait] 'c> { fn foo(&self, _: &'c [u32]) -> &'c u32; } @@ -43,7 +43,7 @@ LL | trait TrLt<#[lt_trait] 'c> { fn foo(&self, _: &'c [u32]) -> &'c u32; } = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `ty_trait` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `ty_trait` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:18:12 | LL | trait TrTy<#[ty_trait] K> { fn foo(&self, _: K); } @@ -52,7 +52,7 @@ LL | trait TrTy<#[ty_trait] K> { fn foo(&self, _: K); } = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `lt_type` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `lt_type` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:21:11 | LL | type TyLt<#[lt_type] 'd> = &'d u32; @@ -61,7 +61,7 @@ LL | type TyLt<#[lt_type] 'd> = &'d u32; = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `ty_type` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `ty_type` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:23:11 | LL | type TyTy<#[ty_type] L> = (L, ); @@ -70,7 +70,7 @@ LL | type TyTy<#[ty_type] L> = (L, ); = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `lt_inherent` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `lt_inherent` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:26:6 | LL | impl<#[lt_inherent] 'e> StLt<'e> { } @@ -79,7 +79,7 @@ LL | impl<#[lt_inherent] 'e> StLt<'e> { } = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `ty_inherent` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `ty_inherent` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:28:6 | LL | impl<#[ty_inherent] M> StTy { } @@ -88,7 +88,7 @@ LL | impl<#[ty_inherent] M> StTy { } = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `lt_impl_for` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `lt_impl_for` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:31:6 | LL | impl<#[lt_impl_for] 'f> TrLt<'f> for StLt<'f> { @@ -97,7 +97,7 @@ LL | impl<#[lt_impl_for] 'f> TrLt<'f> for StLt<'f> { = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `ty_impl_for` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `ty_impl_for` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:35:6 | LL | impl<#[ty_impl_for] N> TrTy for StTy { @@ -106,7 +106,7 @@ LL | impl<#[ty_impl_for] N> TrTy for StTy { = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `lt_fn` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `lt_fn` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:40:9 | LL | fn f_lt<#[lt_fn] 'g>(_: &'g [u32]) -> &'g u32 { loop { } } @@ -115,7 +115,7 @@ LL | fn f_lt<#[lt_fn] 'g>(_: &'g [u32]) -> &'g u32 { loop { } } = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `ty_fn` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `ty_fn` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:42:9 | LL | fn f_ty<#[ty_fn] O>(_: O) { } @@ -124,7 +124,7 @@ LL | fn f_ty<#[ty_fn] O>(_: O) { } = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `lt_meth` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `lt_meth` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:46:13 | LL | fn m_lt<#[lt_meth] 'h>(_: &'h [u32]) -> &'h u32 { loop { } } @@ -133,7 +133,7 @@ LL | fn m_lt<#[lt_meth] 'h>(_: &'h [u32]) -> &'h u32 { loop { } } = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `ty_meth` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `ty_meth` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:48:13 | LL | fn m_ty<#[ty_meth] P>(_: P) { } @@ -142,7 +142,7 @@ LL | fn m_ty<#[ty_meth] P>(_: P) { } = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `lt_hof` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `lt_hof` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute2.rs:53:19 | LL | where Q: for <#[lt_hof] 'i> Fn(&'i [u32]) -> &'i u32 diff --git a/src/test/ui/feature-gates/feature-gate-may-dangle.rs b/src/test/ui/feature-gates/feature-gate-may-dangle.rs index 20896e426f65d..23db92c15df65 100644 --- a/src/test/ui/feature-gates/feature-gate-may-dangle.rs +++ b/src/test/ui/feature-gates/feature-gate-may-dangle.rs @@ -4,7 +4,7 @@ struct Pt(A); unsafe impl<#[may_dangle] A> Drop for Pt { - //~^ ERROR may_dangle has unstable semantics and may be removed in the future + //~^ ERROR `may_dangle` has unstable semantics and may be removed in the future fn drop(&mut self) { } } diff --git a/src/test/ui/feature-gates/feature-gate-may-dangle.stderr b/src/test/ui/feature-gates/feature-gate-may-dangle.stderr index c47bb75e6bc07..b344d73757473 100644 --- a/src/test/ui/feature-gates/feature-gate-may-dangle.stderr +++ b/src/test/ui/feature-gates/feature-gate-may-dangle.stderr @@ -1,4 +1,4 @@ -error[E0658]: may_dangle has unstable semantics and may be removed in the future +error[E0658]: `may_dangle` has unstable semantics and may be removed in the future --> $DIR/feature-gate-may-dangle.rs:6:13 | LL | unsafe impl<#[may_dangle] A> Drop for Pt { diff --git a/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr b/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr index 7c5aa5381e8c7..3501aa8486032 100644 --- a/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr +++ b/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr @@ -37,7 +37,7 @@ LL | #[rustc_unknown] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable -error[E0658]: The attribute `rustc_unknown` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `rustc_unknown` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-rustc-attrs.rs:20:3 | LL | #[rustc_unknown] diff --git a/src/test/ui/issues/issue-32655.stderr b/src/test/ui/issues/issue-32655.stderr index 43bb4105c8dbf..d7fda09c31a05 100644 --- a/src/test/ui/issues/issue-32655.stderr +++ b/src/test/ui/issues/issue-32655.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `derive_Clone` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `derive_Clone` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/issue-32655.rs:6:11 | LL | #[derive_Clone] @@ -10,7 +10,7 @@ LL | foo!(); = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `derive_Clone` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `derive_Clone` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/issue-32655.rs:18:7 | LL | #[derive_Clone] diff --git a/src/test/ui/issues/issue-49074.rs b/src/test/ui/issues/issue-49074.rs index ad66e421c6b9d..24d9c03fa625e 100644 --- a/src/test/ui/issues/issue-49074.rs +++ b/src/test/ui/issues/issue-49074.rs @@ -1,7 +1,7 @@ // Check that unknown attribute error is shown even if there are unresolved macros. #[marco_use] // typo -//~^ ERROR The attribute `marco_use` is currently unknown to the compiler +//~^ ERROR the attribute `marco_use` is currently unknown to the compiler mod foo { macro_rules! bar { () => (); diff --git a/src/test/ui/issues/issue-49074.stderr b/src/test/ui/issues/issue-49074.stderr index 3ab876dbf4254..244a949d69899 100644 --- a/src/test/ui/issues/issue-49074.stderr +++ b/src/test/ui/issues/issue-49074.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `marco_use` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `marco_use` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/issue-49074.rs:3:3 | LL | #[marco_use] // typo diff --git a/src/test/ui/macros/macro-reexport-removed.stderr b/src/test/ui/macros/macro-reexport-removed.stderr index 44233d7b7dda3..0d7295dcef63b 100644 --- a/src/test/ui/macros/macro-reexport-removed.stderr +++ b/src/test/ui/macros/macro-reexport-removed.stderr @@ -10,7 +10,7 @@ note: subsumed by `pub use` LL | #![feature(macro_reexport)] | ^^^^^^^^^^^^^^ -error[E0658]: The attribute `macro_reexport` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `macro_reexport` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/macro-reexport-removed.rs:5:3 | LL | #[macro_reexport(macro_one)] diff --git a/src/test/ui/proc-macro/derive-helper-shadowing.stderr b/src/test/ui/proc-macro/derive-helper-shadowing.stderr index 984ea4fb8addd..cb0a8a119e2ee 100644 --- a/src/test/ui/proc-macro/derive-helper-shadowing.stderr +++ b/src/test/ui/proc-macro/derive-helper-shadowing.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `empty_helper` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `empty_helper` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/derive-helper-shadowing.rs:22:15 | LL | #[empty_helper] diff --git a/src/test/ui/proc-macro/derive-still-gated.stderr b/src/test/ui/proc-macro/derive-still-gated.stderr index a6c0ce6260a4d..bde9814dc660d 100644 --- a/src/test/ui/proc-macro/derive-still-gated.stderr +++ b/src/test/ui/proc-macro/derive-still-gated.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `derive_Empty` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `derive_Empty` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/derive-still-gated.rs:6:3 | LL | #[derive_Empty] diff --git a/src/test/ui/proc-macro/expand-to-unstable-2.stderr b/src/test/ui/proc-macro/expand-to-unstable-2.stderr index 3a729846d7852..719156cba5c9f 100644 --- a/src/test/ui/proc-macro/expand-to-unstable-2.stderr +++ b/src/test/ui/proc-macro/expand-to-unstable-2.stderr @@ -7,7 +7,7 @@ LL | #[derive(Unstable)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable -error[E0658]: The attribute `rustc_foo` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `rustc_foo` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/expand-to-unstable-2.rs:6:10 | LL | #[derive(Unstable)] diff --git a/src/test/ui/proc-macro/issue-41211.stderr b/src/test/ui/proc-macro/issue-41211.stderr index b5c08587e1958..9dd3ac27cf809 100644 --- a/src/test/ui/proc-macro/issue-41211.stderr +++ b/src/test/ui/proc-macro/issue-41211.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `identity_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `identity_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/issue-41211.rs:8:4 | LL | #![identity_attr] diff --git a/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr b/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr index 8a5e346c2b59f..c180de083799f 100644 --- a/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr +++ b/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr @@ -76,7 +76,7 @@ error: can't use a procedural macro from the same crate that defines it LL | #[derive(MyTrait)] | ^^^^^^^ -error[E0658]: The attribute `my_macro` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `my_macro` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/macro-namespace-reserved-2.rs:38:3 | LL | #[my_macro] diff --git a/src/test/ui/proc-macro/proc-macro-attributes.stderr b/src/test/ui/proc-macro/proc-macro-attributes.stderr index 02dfce1a73584..7a9bfc4e72e6d 100644 --- a/src/test/ui/proc-macro/proc-macro-attributes.stderr +++ b/src/test/ui/proc-macro/proc-macro-attributes.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `C` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `C` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/proc-macro-attributes.rs:7:3 | LL | #[C] diff --git a/src/test/ui/proc-macro/proc-macro-gates2.stderr b/src/test/ui/proc-macro/proc-macro-gates2.stderr index 88847193884bc..a7f6f8bfb13d6 100644 --- a/src/test/ui/proc-macro/proc-macro-gates2.stderr +++ b/src/test/ui/proc-macro/proc-macro-gates2.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `empty_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `empty_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/proc-macro-gates2.rs:12:11 | LL | fn _test6<#[empty_attr] T>() {} @@ -7,7 +7,7 @@ LL | fn _test6<#[empty_attr] T>() {} = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `empty_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `empty_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/proc-macro-gates2.rs:17:9 | LL | #[empty_attr] diff --git a/src/test/ui/proc-macro/resolve-error.stderr b/src/test/ui/proc-macro/resolve-error.stderr index 02cf7cdb964e6..6f3f4c939f4bb 100644 --- a/src/test/ui/proc-macro/resolve-error.stderr +++ b/src/test/ui/proc-macro/resolve-error.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `attr_proc_macra` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `attr_proc_macra` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/resolve-error.rs:27:3 | LL | #[attr_proc_macra] @@ -7,7 +7,7 @@ LL | #[attr_proc_macra] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `FooWithLongNan` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `FooWithLongNan` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/resolve-error.rs:31:3 | LL | #[FooWithLongNan] diff --git a/src/test/ui/reserved/reserved-attr-on-macro.stderr b/src/test/ui/reserved/reserved-attr-on-macro.stderr index cbd111b47bf12..0718da1027376 100644 --- a/src/test/ui/reserved/reserved-attr-on-macro.stderr +++ b/src/test/ui/reserved/reserved-attr-on-macro.stderr @@ -7,7 +7,7 @@ LL | #[rustc_attribute_should_be_reserved] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable -error[E0658]: The attribute `rustc_attribute_should_be_reserved` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `rustc_attribute_should_be_reserved` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/reserved-attr-on-macro.rs:1:3 | LL | #[rustc_attribute_should_be_reserved] diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs b/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs index 352375729bd45..b957c673a41f1 100644 --- a/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs +++ b/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.rs @@ -5,7 +5,7 @@ extern "C" { /// Foo //~^ ERROR documentation comments cannot be applied to function #[test] a: i32, - //~^ ERROR The attribute `test` is currently unknown to the compiler and may have + //~^ ERROR the attribute `test` is currently unknown to the compiler and may have /// Bar //~^ ERROR documentation comments cannot be applied to function #[must_use] @@ -21,7 +21,7 @@ type FnType = fn( /// Foo //~^ ERROR documentation comments cannot be applied to function #[test] a: u32, - //~^ ERROR The attribute `test` is currently unknown to the compiler and may have + //~^ ERROR the attribute `test` is currently unknown to the compiler and may have /// Bar //~^ ERROR documentation comments cannot be applied to function #[must_use] @@ -36,7 +36,7 @@ pub fn foo( /// Foo //~^ ERROR documentation comments cannot be applied to function #[test] a: u32, - //~^ ERROR The attribute `test` is currently unknown to the compiler and may have + //~^ ERROR the attribute `test` is currently unknown to the compiler and may have /// Bar //~^ ERROR documentation comments cannot be applied to function #[must_use] @@ -56,7 +56,7 @@ impl SelfStruct { /// Bar //~^ ERROR documentation comments cannot be applied to function #[test] a: i32, - //~^ ERROR The attribute `test` is currently unknown to the compiler and may have + //~^ ERROR the attribute `test` is currently unknown to the compiler and may have /// Baz //~^ ERROR documentation comments cannot be applied to function #[must_use] @@ -77,7 +77,7 @@ impl RefStruct { /// Bar //~^ ERROR documentation comments cannot be applied to function #[test] a: i32, - //~^ ERROR The attribute `test` is currently unknown to the compiler and may have + //~^ ERROR the attribute `test` is currently unknown to the compiler and may have /// Baz //~^ ERROR documentation comments cannot be applied to function #[must_use] @@ -96,7 +96,7 @@ trait RefTrait { /// Bar //~^ ERROR documentation comments cannot be applied to function #[test] a: i32, - //~^ ERROR The attribute `test` is currently unknown to the compiler and may have + //~^ ERROR the attribute `test` is currently unknown to the compiler and may have /// Baz //~^ ERROR documentation comments cannot be applied to function #[must_use] @@ -115,7 +115,7 @@ impl RefTrait for RefStruct { /// Bar //~^ ERROR documentation comments cannot be applied to function #[test] a: i32, - //~^ ERROR The attribute `test` is currently unknown to the compiler and may have + //~^ ERROR the attribute `test` is currently unknown to the compiler and may have /// Baz //~^ ERROR documentation comments cannot be applied to function #[must_use] @@ -132,7 +132,7 @@ fn main() { /// Foo //~^ ERROR documentation comments cannot be applied to function #[test] a: u32, - //~^ ERROR The attribute `test` is currently unknown to the compiler and may have + //~^ ERROR the attribute `test` is currently unknown to the compiler and may have /// Bar //~^ ERROR documentation comments cannot be applied to function #[must_use] diff --git a/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr b/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr index a4db4b6207d14..a57572abb3513 100644 --- a/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr +++ b/src/test/ui/rfc-2565-param-attrs/param-attrs-builtin-attrs.stderr @@ -262,7 +262,7 @@ error: allow, cfg, cfg_attr, deny, forbid, and warn are the only allowed built-i LL | #[no_mangle] b: i32 | ^^^^^^^^^^^^ -error[E0658]: The attribute `test` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/param-attrs-builtin-attrs.rs:7:9 | LL | #[test] a: i32, @@ -271,7 +271,7 @@ LL | #[test] a: i32, = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `test` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/param-attrs-builtin-attrs.rs:23:5 | LL | #[test] a: u32, @@ -280,7 +280,7 @@ LL | #[test] a: u32, = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `test` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/param-attrs-builtin-attrs.rs:38:5 | LL | #[test] a: u32, @@ -289,7 +289,7 @@ LL | #[test] a: u32, = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `test` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/param-attrs-builtin-attrs.rs:58:9 | LL | #[test] a: i32, @@ -298,7 +298,7 @@ LL | #[test] a: i32, = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `test` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/param-attrs-builtin-attrs.rs:79:9 | LL | #[test] a: i32, @@ -307,7 +307,7 @@ LL | #[test] a: i32, = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `test` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/param-attrs-builtin-attrs.rs:98:9 | LL | #[test] a: i32, @@ -316,7 +316,7 @@ LL | #[test] a: i32, = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `test` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/param-attrs-builtin-attrs.rs:117:9 | LL | #[test] a: i32, @@ -325,7 +325,7 @@ LL | #[test] a: i32, = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `test` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `test` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/param-attrs-builtin-attrs.rs:134:9 | LL | #[test] a: u32, diff --git a/src/test/ui/span/issue-36530.stderr b/src/test/ui/span/issue-36530.stderr index 65f03e756a2bf..8ff8fcb2a0607 100644 --- a/src/test/ui/span/issue-36530.stderr +++ b/src/test/ui/span/issue-36530.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/issue-36530.rs:3:3 | LL | #[foo] @@ -16,7 +16,7 @@ LL | #![foo] = note: for more information, see https://github.com/rust-lang/rust/issues/54726 = help: add `#![feature(custom_inner_attributes)]` to the crate attributes to enable -error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/issue-36530.rs:5:8 | LL | #![foo] diff --git a/src/test/ui/suggestions/attribute-typos.stderr b/src/test/ui/suggestions/attribute-typos.stderr index 7c28e88272829..4cc51561b31a1 100644 --- a/src/test/ui/suggestions/attribute-typos.stderr +++ b/src/test/ui/suggestions/attribute-typos.stderr @@ -7,7 +7,7 @@ LL | #[rustc_err] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable -error[E0658]: The attribute `rustc_err` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `rustc_err` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/attribute-typos.rs:7:3 | LL | #[rustc_err] @@ -16,7 +16,7 @@ LL | #[rustc_err] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `tests` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `tests` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/attribute-typos.rs:4:3 | LL | #[tests] @@ -25,7 +25,7 @@ LL | #[tests] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: The attribute `deprcated` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `deprcated` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/attribute-typos.rs:1:3 | LL | #[deprcated] diff --git a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr index 32c9a1e8b6ed1..3ac8c4186e164 100644 --- a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr +++ b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr @@ -1,4 +1,4 @@ -error[E0658]: The attribute `rustfmt` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: the attribute `rustfmt` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/tool-attributes-misplaced-1.rs:8:3 | LL | #[rustfmt] From b7459f329f3a0a601cb1852358a85c6edd3057ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20K=C3=BCber?= Date: Sat, 13 Jul 2019 13:37:31 -0700 Subject: [PATCH 2/2] review comments --- src/librustc_resolve/macros.rs | 2 +- src/test/ui/attributes/obsolete-attr.stderr | 4 +-- src/test/ui/attributes/unknown-attr.stderr | 6 ++--- ...r-unknown-attribute-macro-expansion.stderr | 2 +- src/test/ui/custom_attribute.rs | 6 ++--- src/test/ui/custom_attribute.stderr | 6 ++--- .../feature-gate-custom_attribute.stderr | 26 +++++++++---------- .../feature-gate-rustc-attrs.stderr | 2 +- src/test/ui/issues/issue-32655.stderr | 4 +-- src/test/ui/issues/issue-49074.rs | 2 +- src/test/ui/issues/issue-49074.stderr | 2 +- .../ui/macros/macro-reexport-removed.stderr | 2 +- .../proc-macro/derive-helper-shadowing.stderr | 2 +- .../ui/proc-macro/derive-still-gated.stderr | 2 +- .../ui/proc-macro/expand-to-unstable-2.stderr | 2 +- src/test/ui/proc-macro/issue-41211.stderr | 2 +- .../macro-namespace-reserved-2.stderr | 2 +- .../proc-macro/proc-macro-attributes.stderr | 2 +- src/test/ui/proc-macro/resolve-error.stderr | 4 +-- .../ui/reserved/reserved-attr-on-macro.stderr | 2 +- src/test/ui/span/issue-36530.stderr | 4 +-- .../ui/suggestions/attribute-typos.stderr | 6 ++--- .../tool-attributes-misplaced-1.stderr | 2 +- 23 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/librustc_resolve/macros.rs b/src/librustc_resolve/macros.rs index 7f25d81982a64..fc1becfe30960 100644 --- a/src/librustc_resolve/macros.rs +++ b/src/librustc_resolve/macros.rs @@ -328,7 +328,7 @@ impl<'a> Resolver<'a> { if attr_kind == NonMacroAttrKind::Custom { assert!(path.segments.len() == 1); if !features.custom_attribute { - let msg = format!("the attribute `{}` is currently unknown to the \ + let msg = format!("The attribute `{}` is currently unknown to the \ compiler and may have meaning added to it in the \ future", path); self.report_unknown_attribute( diff --git a/src/test/ui/attributes/obsolete-attr.stderr b/src/test/ui/attributes/obsolete-attr.stderr index 1d5caa81a5049..6021700dfbb1d 100644 --- a/src/test/ui/attributes/obsolete-attr.stderr +++ b/src/test/ui/attributes/obsolete-attr.stderr @@ -1,4 +1,4 @@ -error[E0658]: the attribute `fixed_stack_segment` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `fixed_stack_segment` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/obsolete-attr.rs:5:3 | LL | #[fixed_stack_segment] fn f() {} @@ -7,7 +7,7 @@ LL | #[fixed_stack_segment] fn f() {} = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `ab_isize` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `ab_isize` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/obsolete-attr.rs:3:3 | LL | #[ab_isize="stdcall"] extern {} diff --git a/src/test/ui/attributes/unknown-attr.stderr b/src/test/ui/attributes/unknown-attr.stderr index 19e0e0a6b6303..b46db5662932c 100644 --- a/src/test/ui/attributes/unknown-attr.stderr +++ b/src/test/ui/attributes/unknown-attr.stderr @@ -1,4 +1,4 @@ -error[E0658]: the attribute `mutable_doc` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `mutable_doc` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/unknown-attr.rs:5:4 | LL | #![mutable_doc] @@ -7,7 +7,7 @@ LL | #![mutable_doc] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `dance` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `dance` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/unknown-attr.rs:7:3 | LL | #[dance] mod a {} @@ -16,7 +16,7 @@ LL | #[dance] mod a {} = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `dance` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `dance` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/unknown-attr.rs:9:3 | LL | #[dance] fn main() {} diff --git a/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr b/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr index 199227c048151..cf4d0fc5ad07f 100644 --- a/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr +++ b/src/test/ui/conditional-compilation/cfg-attr-unknown-attribute-macro-expansion.stderr @@ -1,4 +1,4 @@ -error[E0658]: the attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `unknown` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/cfg-attr-unknown-attribute-macro-expansion.rs:3:27 | LL | #[cfg_attr(all(), unknown)] diff --git a/src/test/ui/custom_attribute.rs b/src/test/ui/custom_attribute.rs index 37834c0206137..9cb43ab07ad6d 100644 --- a/src/test/ui/custom_attribute.rs +++ b/src/test/ui/custom_attribute.rs @@ -1,9 +1,9 @@ #![feature(stmt_expr_attributes)] -#[foo] //~ ERROR the attribute `foo` +#[foo] //~ ERROR The attribute `foo` fn main() { - #[foo] //~ ERROR the attribute `foo` + #[foo] //~ ERROR The attribute `foo` let x = (); - #[foo] //~ ERROR the attribute `foo` + #[foo] //~ ERROR The attribute `foo` x } diff --git a/src/test/ui/custom_attribute.stderr b/src/test/ui/custom_attribute.stderr index e273c064ac41c..84c4e33e55a1a 100644 --- a/src/test/ui/custom_attribute.stderr +++ b/src/test/ui/custom_attribute.stderr @@ -1,4 +1,4 @@ -error[E0658]: the attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/custom_attribute.rs:3:3 | LL | #[foo] @@ -7,7 +7,7 @@ LL | #[foo] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/custom_attribute.rs:5:7 | LL | #[foo] @@ -16,7 +16,7 @@ LL | #[foo] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/custom_attribute.rs:7:7 | LL | #[foo] diff --git a/src/test/ui/feature-gates/feature-gate-custom_attribute.stderr b/src/test/ui/feature-gates/feature-gate-custom_attribute.stderr index 11619a5dbd83f..12175feadd63a 100644 --- a/src/test/ui/feature-gates/feature-gate-custom_attribute.stderr +++ b/src/test/ui/feature-gates/feature-gate-custom_attribute.stderr @@ -1,4 +1,4 @@ -error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:7:3 | LL | #[fake_attr] @@ -7,7 +7,7 @@ LL | #[fake_attr] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:8:3 | LL | #[fake_attr(100)] @@ -16,7 +16,7 @@ LL | #[fake_attr(100)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:9:3 | LL | #[fake_attr(1, 2, 3)] @@ -25,7 +25,7 @@ LL | #[fake_attr(1, 2, 3)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:10:3 | LL | #[fake_attr("hello")] @@ -34,7 +34,7 @@ LL | #[fake_attr("hello")] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:11:3 | LL | #[fake_attr(name = "hello")] @@ -43,7 +43,7 @@ LL | #[fake_attr(name = "hello")] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:12:3 | LL | #[fake_attr(1, "hi", key = 12, true, false)] @@ -52,7 +52,7 @@ LL | #[fake_attr(1, "hi", key = 12, true, false)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:13:3 | LL | #[fake_attr(key = "hello", val = 10)] @@ -61,7 +61,7 @@ LL | #[fake_attr(key = "hello", val = 10)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:14:3 | LL | #[fake_attr(key("hello"), val(10))] @@ -70,7 +70,7 @@ LL | #[fake_attr(key("hello"), val(10))] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:15:3 | LL | #[fake_attr(enabled = true, disabled = false)] @@ -79,7 +79,7 @@ LL | #[fake_attr(enabled = true, disabled = false)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:16:3 | LL | #[fake_attr(true)] @@ -88,7 +88,7 @@ LL | #[fake_attr(true)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:17:3 | LL | #[fake_attr(pi = 3.14159)] @@ -97,7 +97,7 @@ LL | #[fake_attr(pi = 3.14159)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `fake_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:18:3 | LL | #[fake_attr(b"hi")] @@ -106,7 +106,7 @@ LL | #[fake_attr(b"hi")] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `fake_doc` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `fake_doc` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-custom_attribute.rs:19:3 | LL | #[fake_doc(r"doc")] diff --git a/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr b/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr index 3501aa8486032..7c5aa5381e8c7 100644 --- a/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr +++ b/src/test/ui/feature-gates/feature-gate-rustc-attrs.stderr @@ -37,7 +37,7 @@ LL | #[rustc_unknown] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable -error[E0658]: the attribute `rustc_unknown` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `rustc_unknown` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/feature-gate-rustc-attrs.rs:20:3 | LL | #[rustc_unknown] diff --git a/src/test/ui/issues/issue-32655.stderr b/src/test/ui/issues/issue-32655.stderr index d7fda09c31a05..43bb4105c8dbf 100644 --- a/src/test/ui/issues/issue-32655.stderr +++ b/src/test/ui/issues/issue-32655.stderr @@ -1,4 +1,4 @@ -error[E0658]: the attribute `derive_Clone` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `derive_Clone` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/issue-32655.rs:6:11 | LL | #[derive_Clone] @@ -10,7 +10,7 @@ LL | foo!(); = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `derive_Clone` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `derive_Clone` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/issue-32655.rs:18:7 | LL | #[derive_Clone] diff --git a/src/test/ui/issues/issue-49074.rs b/src/test/ui/issues/issue-49074.rs index 24d9c03fa625e..ad66e421c6b9d 100644 --- a/src/test/ui/issues/issue-49074.rs +++ b/src/test/ui/issues/issue-49074.rs @@ -1,7 +1,7 @@ // Check that unknown attribute error is shown even if there are unresolved macros. #[marco_use] // typo -//~^ ERROR the attribute `marco_use` is currently unknown to the compiler +//~^ ERROR The attribute `marco_use` is currently unknown to the compiler mod foo { macro_rules! bar { () => (); diff --git a/src/test/ui/issues/issue-49074.stderr b/src/test/ui/issues/issue-49074.stderr index 244a949d69899..3ab876dbf4254 100644 --- a/src/test/ui/issues/issue-49074.stderr +++ b/src/test/ui/issues/issue-49074.stderr @@ -1,4 +1,4 @@ -error[E0658]: the attribute `marco_use` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `marco_use` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/issue-49074.rs:3:3 | LL | #[marco_use] // typo diff --git a/src/test/ui/macros/macro-reexport-removed.stderr b/src/test/ui/macros/macro-reexport-removed.stderr index 0d7295dcef63b..44233d7b7dda3 100644 --- a/src/test/ui/macros/macro-reexport-removed.stderr +++ b/src/test/ui/macros/macro-reexport-removed.stderr @@ -10,7 +10,7 @@ note: subsumed by `pub use` LL | #![feature(macro_reexport)] | ^^^^^^^^^^^^^^ -error[E0658]: the attribute `macro_reexport` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `macro_reexport` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/macro-reexport-removed.rs:5:3 | LL | #[macro_reexport(macro_one)] diff --git a/src/test/ui/proc-macro/derive-helper-shadowing.stderr b/src/test/ui/proc-macro/derive-helper-shadowing.stderr index cb0a8a119e2ee..984ea4fb8addd 100644 --- a/src/test/ui/proc-macro/derive-helper-shadowing.stderr +++ b/src/test/ui/proc-macro/derive-helper-shadowing.stderr @@ -1,4 +1,4 @@ -error[E0658]: the attribute `empty_helper` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `empty_helper` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/derive-helper-shadowing.rs:22:15 | LL | #[empty_helper] diff --git a/src/test/ui/proc-macro/derive-still-gated.stderr b/src/test/ui/proc-macro/derive-still-gated.stderr index bde9814dc660d..a6c0ce6260a4d 100644 --- a/src/test/ui/proc-macro/derive-still-gated.stderr +++ b/src/test/ui/proc-macro/derive-still-gated.stderr @@ -1,4 +1,4 @@ -error[E0658]: the attribute `derive_Empty` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `derive_Empty` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/derive-still-gated.rs:6:3 | LL | #[derive_Empty] diff --git a/src/test/ui/proc-macro/expand-to-unstable-2.stderr b/src/test/ui/proc-macro/expand-to-unstable-2.stderr index 719156cba5c9f..3a729846d7852 100644 --- a/src/test/ui/proc-macro/expand-to-unstable-2.stderr +++ b/src/test/ui/proc-macro/expand-to-unstable-2.stderr @@ -7,7 +7,7 @@ LL | #[derive(Unstable)] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable -error[E0658]: the attribute `rustc_foo` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `rustc_foo` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/expand-to-unstable-2.rs:6:10 | LL | #[derive(Unstable)] diff --git a/src/test/ui/proc-macro/issue-41211.stderr b/src/test/ui/proc-macro/issue-41211.stderr index 9dd3ac27cf809..b5c08587e1958 100644 --- a/src/test/ui/proc-macro/issue-41211.stderr +++ b/src/test/ui/proc-macro/issue-41211.stderr @@ -1,4 +1,4 @@ -error[E0658]: the attribute `identity_attr` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `identity_attr` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/issue-41211.rs:8:4 | LL | #![identity_attr] diff --git a/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr b/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr index c180de083799f..8a5e346c2b59f 100644 --- a/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr +++ b/src/test/ui/proc-macro/macro-namespace-reserved-2.stderr @@ -76,7 +76,7 @@ error: can't use a procedural macro from the same crate that defines it LL | #[derive(MyTrait)] | ^^^^^^^ -error[E0658]: the attribute `my_macro` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `my_macro` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/macro-namespace-reserved-2.rs:38:3 | LL | #[my_macro] diff --git a/src/test/ui/proc-macro/proc-macro-attributes.stderr b/src/test/ui/proc-macro/proc-macro-attributes.stderr index 7a9bfc4e72e6d..02dfce1a73584 100644 --- a/src/test/ui/proc-macro/proc-macro-attributes.stderr +++ b/src/test/ui/proc-macro/proc-macro-attributes.stderr @@ -1,4 +1,4 @@ -error[E0658]: the attribute `C` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `C` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/proc-macro-attributes.rs:7:3 | LL | #[C] diff --git a/src/test/ui/proc-macro/resolve-error.stderr b/src/test/ui/proc-macro/resolve-error.stderr index 6f3f4c939f4bb..02cf7cdb964e6 100644 --- a/src/test/ui/proc-macro/resolve-error.stderr +++ b/src/test/ui/proc-macro/resolve-error.stderr @@ -1,4 +1,4 @@ -error[E0658]: the attribute `attr_proc_macra` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `attr_proc_macra` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/resolve-error.rs:27:3 | LL | #[attr_proc_macra] @@ -7,7 +7,7 @@ LL | #[attr_proc_macra] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `FooWithLongNan` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `FooWithLongNan` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/resolve-error.rs:31:3 | LL | #[FooWithLongNan] diff --git a/src/test/ui/reserved/reserved-attr-on-macro.stderr b/src/test/ui/reserved/reserved-attr-on-macro.stderr index 0718da1027376..cbd111b47bf12 100644 --- a/src/test/ui/reserved/reserved-attr-on-macro.stderr +++ b/src/test/ui/reserved/reserved-attr-on-macro.stderr @@ -7,7 +7,7 @@ LL | #[rustc_attribute_should_be_reserved] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable -error[E0658]: the attribute `rustc_attribute_should_be_reserved` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `rustc_attribute_should_be_reserved` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/reserved-attr-on-macro.rs:1:3 | LL | #[rustc_attribute_should_be_reserved] diff --git a/src/test/ui/span/issue-36530.stderr b/src/test/ui/span/issue-36530.stderr index 8ff8fcb2a0607..65f03e756a2bf 100644 --- a/src/test/ui/span/issue-36530.stderr +++ b/src/test/ui/span/issue-36530.stderr @@ -1,4 +1,4 @@ -error[E0658]: the attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/issue-36530.rs:3:3 | LL | #[foo] @@ -16,7 +16,7 @@ LL | #![foo] = note: for more information, see https://github.com/rust-lang/rust/issues/54726 = help: add `#![feature(custom_inner_attributes)]` to the crate attributes to enable -error[E0658]: the attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/issue-36530.rs:5:8 | LL | #![foo] diff --git a/src/test/ui/suggestions/attribute-typos.stderr b/src/test/ui/suggestions/attribute-typos.stderr index 4cc51561b31a1..7c28e88272829 100644 --- a/src/test/ui/suggestions/attribute-typos.stderr +++ b/src/test/ui/suggestions/attribute-typos.stderr @@ -7,7 +7,7 @@ LL | #[rustc_err] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(rustc_attrs)]` to the crate attributes to enable -error[E0658]: the attribute `rustc_err` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `rustc_err` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/attribute-typos.rs:7:3 | LL | #[rustc_err] @@ -16,7 +16,7 @@ LL | #[rustc_err] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `tests` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `tests` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/attribute-typos.rs:4:3 | LL | #[tests] @@ -25,7 +25,7 @@ LL | #[tests] = note: for more information, see https://github.com/rust-lang/rust/issues/29642 = help: add `#![feature(custom_attribute)]` to the crate attributes to enable -error[E0658]: the attribute `deprcated` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `deprcated` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/attribute-typos.rs:1:3 | LL | #[deprcated] diff --git a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr index 3ac8c4186e164..32c9a1e8b6ed1 100644 --- a/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr +++ b/src/test/ui/tool-attributes/tool-attributes-misplaced-1.stderr @@ -1,4 +1,4 @@ -error[E0658]: the attribute `rustfmt` is currently unknown to the compiler and may have meaning added to it in the future +error[E0658]: The attribute `rustfmt` is currently unknown to the compiler and may have meaning added to it in the future --> $DIR/tool-attributes-misplaced-1.rs:8:3 | LL | #[rustfmt]