diff --git a/compiler/rustc_attr_data_structures/src/attributes.rs b/compiler/rustc_attr_data_structures/src/attributes.rs
index 9ac8de0227d79..89b3872d50fc6 100644
--- a/compiler/rustc_attr_data_structures/src/attributes.rs
+++ b/compiler/rustc_attr_data_structures/src/attributes.rs
@@ -175,6 +175,11 @@ pub enum AttributeKind {
span: Span,
},
ConstStabilityIndirect,
+ CrateName {
+ name: Symbol,
+ name_span: Span,
+ style: AttrStyle,
+ },
Deprecation {
deprecation: Deprecation,
span: Span,
@@ -195,3 +200,24 @@ pub enum AttributeKind {
},
// tidy-alphabetical-end
}
+
+impl AttributeKind {
+ pub fn crate_level(&self) -> Option<(AttrStyle, Span)> {
+ match self {
+ AttributeKind::AllowConstFnUnstable(..)
+ | AttributeKind::AllowInternalUnstable(..)
+ | AttributeKind::BodyStability { .. }
+ | AttributeKind::Confusables { .. }
+ | AttributeKind::ConstStability { .. }
+ | AttributeKind::ConstStabilityIndirect
+ | AttributeKind::Deprecation { .. }
+ | AttributeKind::Diagnostic(..)
+ | AttributeKind::DocComment { .. }
+ | AttributeKind::MacroTransparency(..)
+ | AttributeKind::Repr(..)
+ | AttributeKind::Stability { .. } => None,
+
+ AttributeKind::CrateName { style, name_span, .. } => Some((*style, *name_span)),
+ }
+ }
+}
diff --git a/compiler/rustc_attr_parsing/messages.ftl b/compiler/rustc_attr_parsing/messages.ftl
index 45174c9582d33..6698e2d003693 100644
--- a/compiler/rustc_attr_parsing/messages.ftl
+++ b/compiler/rustc_attr_parsing/messages.ftl
@@ -87,6 +87,8 @@ attr_parsing_multiple_item =
attr_parsing_multiple_stability_levels =
multiple stability levels
+attr_parsing_name_value = malformed `{$name}` attribute: expected to be of the form `#[{$name} = ...]`
+
attr_parsing_non_ident_feature =
'feature' is not an identifier
diff --git a/compiler/rustc_attr_parsing/src/attributes/crate_name.rs b/compiler/rustc_attr_parsing/src/attributes/crate_name.rs
new file mode 100644
index 0000000000000..f1116ee4ab462
--- /dev/null
+++ b/compiler/rustc_attr_parsing/src/attributes/crate_name.rs
@@ -0,0 +1,42 @@
+use rustc_attr_data_structures::AttributeKind;
+use rustc_span::{Span, Symbol, sym};
+
+use super::SingleAttributeParser;
+use crate::context::AcceptContext;
+use crate::parser::ArgParser;
+use crate::session_diagnostics::{ExpectedNameValue, IncorrectMetaItem, UnusedMultiple};
+
+pub(crate) struct CratenameParser;
+
+impl SingleAttributeParser for CratenameParser {
+ const PATH: &'static [Symbol] = &[sym::crate_name];
+
+ fn on_duplicate(cx: &AcceptContext<'_>, first_span: Span) {
+ // FIXME(jdonszelmann): better duplicate reporting (WIP)
+ cx.emit_err(UnusedMultiple {
+ this: cx.attr_span,
+ other: first_span,
+ name: sym::crate_name,
+ });
+ }
+
+ fn convert(cx: &AcceptContext<'_>, args: &ArgParser<'_>) -> Option<AttributeKind> {
+ if let ArgParser::NameValue(n) = args {
+ if let Some(name) = n.value_as_str() {
+ Some(AttributeKind::CrateName {
+ name,
+ name_span: n.value_span,
+ style: cx.attr_style,
+ })
+ } else {
+ cx.emit_err(IncorrectMetaItem { span: cx.attr_span, suggestion: None });
+
+ None
+ }
+ } else {
+ cx.emit_err(ExpectedNameValue { span: cx.attr_span, name: sym::crate_name });
+
+ None
+ }
+ }
+}
diff --git a/compiler/rustc_attr_parsing/src/attributes/mod.rs b/compiler/rustc_attr_parsing/src/attributes/mod.rs
index 6ecd6b4d7dbb7..16042a1603e93 100644
--- a/compiler/rustc_attr_parsing/src/attributes/mod.rs
+++ b/compiler/rustc_attr_parsing/src/attributes/mod.rs
@@ -26,6 +26,7 @@ use crate::parser::ArgParser;
pub(crate) mod allow_unstable;
pub(crate) mod cfg;
pub(crate) mod confusables;
+pub(crate) mod crate_name;
pub(crate) mod deprecation;
pub(crate) mod repr;
pub(crate) mod stability;
diff --git a/compiler/rustc_attr_parsing/src/attributes/util.rs b/compiler/rustc_attr_parsing/src/attributes/util.rs
index 05a9029c59aa5..65c5f269a8bb0 100644
--- a/compiler/rustc_attr_parsing/src/attributes/util.rs
+++ b/compiler/rustc_attr_parsing/src/attributes/util.rs
@@ -1,7 +1,7 @@
-use rustc_ast::attr::{AttributeExt, first_attr_value_str_by_name};
+use rustc_ast::attr::AttributeExt;
use rustc_attr_data_structures::RustcVersion;
use rustc_feature::is_builtin_attr_name;
-use rustc_span::{Symbol, sym};
+use rustc_span::Symbol;
/// Parse a rustc version number written inside string literal in an attribute,
/// like appears in `since = "1.0.0"`. Suffixes like "-dev" and "-nightly" are
@@ -22,7 +22,3 @@ pub fn parse_version(s: Symbol) -> Option<RustcVersion> {
pub fn is_builtin_attr(attr: &impl AttributeExt) -> bool {
attr.is_doc_comment() || attr.ident().is_some_and(|ident| is_builtin_attr_name(ident.name))
}
-
-pub fn find_crate_name(attrs: &[impl AttributeExt]) -> Option<Symbol> {
- first_attr_value_str_by_name(attrs, sym::crate_name)
-}
diff --git a/compiler/rustc_attr_parsing/src/context.rs b/compiler/rustc_attr_parsing/src/context.rs
index 0e6b0bab082e9..d35bcf9affe1f 100644
--- a/compiler/rustc_attr_parsing/src/context.rs
+++ b/compiler/rustc_attr_parsing/src/context.rs
@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
use std::ops::Deref;
use std::sync::LazyLock;
-use rustc_ast::{self as ast, DelimArgs};
+use rustc_ast::{self as ast, AttrStyle, DelimArgs};
use rustc_attr_data_structures::AttributeKind;
use rustc_errors::{DiagCtxtHandle, Diagnostic};
use rustc_feature::Features;
@@ -14,6 +14,7 @@ use rustc_span::{DUMMY_SP, ErrorGuaranteed, Span, Symbol, sym};
use crate::attributes::allow_unstable::{AllowConstFnUnstableParser, AllowInternalUnstableParser};
use crate::attributes::confusables::ConfusablesParser;
+use crate::attributes::crate_name::CratenameParser;
use crate::attributes::deprecation::DeprecationParser;
use crate::attributes::repr::ReprParser;
use crate::attributes::stability::{
@@ -76,6 +77,7 @@ attribute_groups!(
// tidy-alphabetical-start
Single<ConstStabilityIndirectParser>,
+ Single<CratenameParser>,
Single<DeprecationParser>,
Single<TransparencyParser>,
// tidy-alphabetical-end
@@ -89,6 +91,7 @@ pub(crate) struct AcceptContext<'a> {
pub(crate) group_cx: &'a FinalizeContext<'a>,
/// The span of the attribute currently being parsed
pub(crate) attr_span: Span,
+ pub(crate) attr_style: AttrStyle,
}
impl<'a> AcceptContext<'a> {
@@ -269,6 +272,7 @@ impl<'sess> AttributeParser<'sess> {
let cx = AcceptContext {
group_cx: &group_cx,
attr_span: lower_span(attr.span),
+ attr_style: attr.style,
};
f(&cx, &args)
diff --git a/compiler/rustc_attr_parsing/src/lib.rs b/compiler/rustc_attr_parsing/src/lib.rs
index 9841166b37dbd..2665273ec6116 100644
--- a/compiler/rustc_attr_parsing/src/lib.rs
+++ b/compiler/rustc_attr_parsing/src/lib.rs
@@ -90,7 +90,7 @@ pub mod parser;
mod session_diagnostics;
pub use attributes::cfg::*;
-pub use attributes::util::{find_crate_name, is_builtin_attr, parse_version};
+pub use attributes::util::{is_builtin_attr, parse_version};
pub use context::{AttributeParser, OmitDoc};
pub use rustc_attr_data_structures::*;
diff --git a/compiler/rustc_attr_parsing/src/session_diagnostics.rs b/compiler/rustc_attr_parsing/src/session_diagnostics.rs
index 9d34b807ac2fe..7f57987341e7c 100644
--- a/compiler/rustc_attr_parsing/src/session_diagnostics.rs
+++ b/compiler/rustc_attr_parsing/src/session_diagnostics.rs
@@ -479,3 +479,11 @@ pub(crate) struct UnrecognizedReprHint {
#[primary_span]
pub span: Span,
}
+
+#[derive(Diagnostic)]
+#[diag(attr_parsing_name_value, code = E0539)]
+pub(crate) struct ExpectedNameValue {
+ #[primary_span]
+ pub span: Span,
+ pub name: Symbol,
+}
diff --git a/compiler/rustc_interface/src/passes.rs b/compiler/rustc_interface/src/passes.rs
index 553215ca0af02..c7fe8828d7319 100644
--- a/compiler/rustc_interface/src/passes.rs
+++ b/compiler/rustc_interface/src/passes.rs
@@ -6,6 +6,7 @@ use std::sync::{Arc, LazyLock};
use std::{env, fs, iter};
use rustc_ast as ast;
+use rustc_attr_parsing::{AttributeKind, AttributeParser};
use rustc_codegen_ssa::traits::CodegenBackend;
use rustc_data_structures::parallel;
use rustc_data_structures::steal::Steal;
@@ -32,7 +33,7 @@ use rustc_session::output::{collect_crate_types, filename_for_input};
use rustc_session::search_paths::PathKind;
use rustc_session::{Limit, Session};
use rustc_span::{
- ErrorGuaranteed, FileName, SourceFileHash, SourceFileHashAlgorithm, Span, Symbol, sym,
+ DUMMY_SP, ErrorGuaranteed, FileName, SourceFileHash, SourceFileHashAlgorithm, Span, Symbol, sym,
};
use rustc_target::spec::PanicStrategy;
use rustc_trait_selection::traits;
@@ -1119,6 +1120,20 @@ pub(crate) fn start_codegen<'tcx>(
codegen
}
+pub(crate) fn parse_crate_name(
+ sess: &Session,
+ attrs: &[ast::Attribute],
+ limit_diagnostics: bool,
+) -> Option<(Symbol, Span)> {
+ let rustc_hir::Attribute::Parsed(AttributeKind::CrateName { name, name_span, .. }) =
+ AttributeParser::parse_limited(sess, &attrs, sym::crate_name, DUMMY_SP, limit_diagnostics)?
+ else {
+ unreachable!("crate_name is the only attr we could've parsed here");
+ };
+
+ Some((name, name_span))
+}
+
/// Compute and validate the crate name.
pub fn get_crate_name(sess: &Session, krate_attrs: &[ast::Attribute]) -> Symbol {
// We validate *all* occurrences of `#![crate_name]`, pick the first find and
@@ -1128,8 +1143,7 @@ pub fn get_crate_name(sess: &Session, krate_attrs: &[ast::Attribute]) -> Symbol
// in all code paths that require the crate name very early on, namely before
// macro expansion.
- let attr_crate_name =
- validate_and_find_value_str_builtin_attr(sym::crate_name, sess, krate_attrs);
+ let attr_crate_name = parse_crate_name(sess, krate_attrs, false);
let validate = |name, span| {
rustc_session::output::validate_crate_name(sess, name, span);
diff --git a/compiler/rustc_interface/src/util.rs b/compiler/rustc_interface/src/util.rs
index bc2aae7cd87e2..2602a611b9316 100644
--- a/compiler/rustc_interface/src/util.rs
+++ b/compiler/rustc_interface/src/util.rs
@@ -23,6 +23,7 @@ use rustc_target::spec::Target;
use tracing::info;
use crate::errors;
+use crate::passes::parse_crate_name;
/// Function pointer type that constructs a new CodegenBackend.
type MakeBackendFn = fn() -> Box<dyn CodegenBackend>;
@@ -485,7 +486,7 @@ pub fn build_output_filenames(attrs: &[ast::Attribute], sess: &Session) -> Outpu
.opts
.crate_name
.clone()
- .or_else(|| rustc_attr_parsing::find_crate_name(attrs).map(|n| n.to_string()));
+ .or_else(|| parse_crate_name(sess, attrs, true).map(|i| i.0.to_string()));
match sess.io.output_file {
None => {
diff --git a/compiler/rustc_lint/src/nonstandard_style.rs b/compiler/rustc_lint/src/nonstandard_style.rs
index 49f9ad39780a3..626f23c70c068 100644
--- a/compiler/rustc_lint/src/nonstandard_style.rs
+++ b/compiler/rustc_lint/src/nonstandard_style.rs
@@ -1,8 +1,8 @@
use rustc_abi::ExternAbi;
-use rustc_attr_parsing::{AttributeKind, AttributeParser, ReprAttr};
+use rustc_attr_parsing::{AttributeKind, AttributeParser, ReprAttr, find_attr};
use rustc_hir::def::{DefKind, Res};
use rustc_hir::intravisit::FnKind;
-use rustc_hir::{AttrArgs, AttrItem, Attribute, GenericParamKind, PatExprKind, PatKind};
+use rustc_hir::{Attribute, GenericParamKind, PatExprKind, PatKind};
use rustc_middle::ty;
use rustc_session::config::CrateType;
use rustc_session::{declare_lint, declare_lint_pass};
@@ -342,35 +342,27 @@ impl<'tcx> LateLintPass<'tcx> for NonSnakeCase {
let crate_ident = if let Some(name) = &cx.tcx.sess.opts.crate_name {
Some(Ident::from_str(name))
} else {
- ast::attr::find_by_name(cx.tcx.hir().attrs(hir::CRATE_HIR_ID), sym::crate_name)
- .and_then(|attr| {
- if let Attribute::Unparsed(n) = attr
- && let AttrItem { args: AttrArgs::Eq { eq_span: _, expr: lit }, .. } =
- n.as_ref()
- && let ast::LitKind::Str(name, ..) = lit.kind
- {
- // Discard the double quotes surrounding the literal.
- let sp = cx
- .sess()
- .source_map()
- .span_to_snippet(lit.span)
- .ok()
- .and_then(|snippet| {
- let left = snippet.find('"')?;
- let right = snippet.rfind('"').map(|pos| snippet.len() - pos)?;
-
- Some(
- lit.span
- .with_lo(lit.span.lo() + BytePos(left as u32 + 1))
- .with_hi(lit.span.hi() - BytePos(right as u32)),
- )
- })
- .unwrap_or(lit.span);
-
- Some(Ident::new(name, sp))
- } else {
- None
- }
+ find_attr!(cx.tcx.hir().attrs(hir::CRATE_HIR_ID), AttributeKind::CrateName{name, name_span,..} => (name, name_span))
+ .and_then(|(&name, &span)| {
+ // Discard the double quotes surrounding the literal.
+ let sp = cx
+ .sess()
+ .source_map()
+ .span_to_snippet(span)
+ .ok()
+ .and_then(|snippet| {
+ let left = snippet.find('"')?;
+ let right = snippet.rfind('"').map(|pos| snippet.len() - pos)?;
+
+ Some(
+ span
+ .with_lo(span.lo() + BytePos(left as u32 + 1))
+ .with_hi(span.hi() - BytePos(right as u32)),
+ )
+ })
+ .unwrap_or(span);
+
+ Some(Ident::new(name, sp))
})
};
diff --git a/compiler/rustc_parse/src/validate_attr.rs b/compiler/rustc_parse/src/validate_attr.rs
index 86f673c100c19..b03506e5c4300 100644
--- a/compiler/rustc_parse/src/validate_attr.rs
+++ b/compiler/rustc_parse/src/validate_attr.rs
@@ -217,7 +217,9 @@ pub fn check_builtin_meta_item(
) {
// Some special attributes like `cfg` must be checked
// before the generic check, so we skip them here.
- let should_skip = |name| name == sym::cfg;
+ //
+ // Also, attributes that have a new-style parser don't need to be checked here anymore
+ let should_skip = |name| name == sym::cfg || name == sym::crate_name;
if !should_skip(name) && !is_attr_template_compatible(&template, &meta.kind) {
emit_malformed_attribute(psess, style, meta.span, name, template);
diff --git a/compiler/rustc_passes/src/check_attr.rs b/compiler/rustc_passes/src/check_attr.rs
index 5ada289cc2090..26a5c36aebdb8 100644
--- a/compiler/rustc_passes/src/check_attr.rs
+++ b/compiler/rustc_passes/src/check_attr.rs
@@ -315,22 +315,43 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
let builtin = attr.ident().and_then(|ident| BUILTIN_ATTRIBUTE_MAP.get(&ident.name));
if hir_id != CRATE_HIR_ID {
- if let Some(BuiltinAttribute { type_: AttributeType::CrateLevel, .. }) =
- attr.ident().and_then(|ident| BUILTIN_ATTRIBUTE_MAP.get(&ident.name))
- {
- match attr.style() {
- ast::AttrStyle::Outer => self.tcx.emit_node_span_lint(
- UNUSED_ATTRIBUTES,
- hir_id,
- attr.span(),
- errors::OuterCrateLevelAttr,
- ),
- ast::AttrStyle::Inner => self.tcx.emit_node_span_lint(
- UNUSED_ATTRIBUTES,
- hir_id,
- attr.span(),
- errors::InnerCrateLevelAttr,
- ),
+ if let Attribute::Parsed(attr) = attr {
+ if let Some((style, span)) = attr.crate_level() {
+ match style {
+ ast::AttrStyle::Outer => self.tcx.emit_node_span_lint(
+ UNUSED_ATTRIBUTES,
+ hir_id,
+ span,
+ errors::OuterCrateLevelAttr,
+ ),
+ ast::AttrStyle::Inner => self.tcx.emit_node_span_lint(
+ UNUSED_ATTRIBUTES,
+ hir_id,
+ span,
+ errors::InnerCrateLevelAttr,
+ ),
+ }
+ }
+ } else {
+ // FIXME(jdonszelmann): remove once all crate-level attrs are parsed and caught by
+ // the above
+ if let Some(BuiltinAttribute { type_: AttributeType::CrateLevel, .. }) =
+ attr.ident().and_then(|ident| BUILTIN_ATTRIBUTE_MAP.get(&ident.name))
+ {
+ match attr.style() {
+ ast::AttrStyle::Outer => self.tcx.emit_node_span_lint(
+ UNUSED_ATTRIBUTES,
+ hir_id,
+ attr.span(),
+ errors::OuterCrateLevelAttr,
+ ),
+ ast::AttrStyle::Inner => self.tcx.emit_node_span_lint(
+ UNUSED_ATTRIBUTES,
+ hir_id,
+ attr.span(),
+ errors::InnerCrateLevelAttr,
+ ),
+ }
}
}
}
diff --git a/tests/ui/attributes/crate-name-macro-call.rs b/tests/ui/attributes/crate-name-macro-call.rs
index 1aae2e506e29b..fbf777afbc524 100644
--- a/tests/ui/attributes/crate-name-macro-call.rs
+++ b/tests/ui/attributes/crate-name-macro-call.rs
@@ -1,6 +1,6 @@
// issue: rust-lang/rust#122001
// Ensure we reject macro calls inside `#![crate_name]` as their result wouldn't get honored anyway.
-#![crate_name = concat!("my", "crate")] //~ ERROR malformed `crate_name` attribute input
+#![crate_name = concat!("my", "crate")] //~ ERROR expected a quoted string literal
fn main() {}
diff --git a/tests/ui/attributes/crate-name-macro-call.stderr b/tests/ui/attributes/crate-name-macro-call.stderr
index ab562b41a31f4..6ee8f952bbb69 100644
--- a/tests/ui/attributes/crate-name-macro-call.stderr
+++ b/tests/ui/attributes/crate-name-macro-call.stderr
@@ -1,8 +1,9 @@
-error: malformed `crate_name` attribute input
+error[E0539]: expected a quoted string literal
--> $DIR/crate-name-macro-call.rs:4:1
|
LL | #![crate_name = concat!("my", "crate")]
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![crate_name = "name"]`
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to 1 previous error
+For more information about this error, try `rustc --explain E0539`.
diff --git a/tests/ui/attributes/crate_name_on_other_items.rs b/tests/ui/attributes/crate_name_on_other_items.rs
new file mode 100644
index 0000000000000..35ea158312d13
--- /dev/null
+++ b/tests/ui/attributes/crate_name_on_other_items.rs
@@ -0,0 +1,11 @@
+//@compile-flags: --crate-type=lib
+// reproduces #137687
+#[crate_name = concat!("Cloneb")] //~ ERROR expected a quoted string literal
+
+
+macro_rules! inline {
+ () => {};
+}
+
+#[crate_name] //~ ERROR malformed `crate_name` attribute: expected to be of the form `#[crate_name = ...]`
+mod foo {}
diff --git a/tests/ui/attributes/crate_name_on_other_items.stderr b/tests/ui/attributes/crate_name_on_other_items.stderr
new file mode 100644
index 0000000000000..204105742839b
--- /dev/null
+++ b/tests/ui/attributes/crate_name_on_other_items.stderr
@@ -0,0 +1,15 @@
+error[E0539]: expected a quoted string literal
+ --> $DIR/crate_name_on_other_items.rs:3:1
+ |
+LL | #[crate_name = concat!("Cloneb")]
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0539]: malformed `crate_name` attribute: expected to be of the form `#[crate_name = ...]`
+ --> $DIR/crate_name_on_other_items.rs:10:1
+ |
+LL | #[crate_name]
+ | ^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0539`.
diff --git a/tests/ui/crate-name-mismatch.stderr b/tests/ui/crate-name-mismatch.stderr
index 511562618d569..a7a5429f3d793 100644
--- a/tests/ui/crate-name-mismatch.stderr
+++ b/tests/ui/crate-name-mismatch.stderr
@@ -1,8 +1,8 @@
error: `--crate-name` and `#[crate_name]` are required to match, but `foo` != `bar`
- --> $DIR/crate-name-mismatch.rs:3:1
+ --> $DIR/crate-name-mismatch.rs:3:17
|
LL | #![crate_name = "bar"]
- | ^^^^^^^^^^^^^^^^^^^^^^
+ | ^^^^^
error: aborting due to 1 previous error
diff --git a/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr
index 1c6868dc95d9f..77ddda2d0069d 100644
--- a/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr
+++ b/tests/ui/feature-gates/issue-43106-gating-of-builtin-attrs.stderr
@@ -320,10 +320,10 @@ LL | #[windows_subsystem = "windows"]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
warning: crate-level attribute should be an inner attribute: add an exclamation mark: `#![foo]`
- --> $DIR/issue-43106-gating-of-builtin-attrs.rs:629:1
+ --> $DIR/issue-43106-gating-of-builtin-attrs.rs:629:16
|
LL | #[crate_name = "0900"]
- | ^^^^^^^^^^^^^^^^^^^^^^
+ | ^^^^^^
warning: crate-level attribute should be an inner attribute: add an exclamation mark: `#![foo]`
--> $DIR/issue-43106-gating-of-builtin-attrs.rs:648:1
@@ -940,34 +940,34 @@ LL | #[windows_subsystem = "windows"] impl S { }
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
warning: crate-level attribute should be in the root module
- --> $DIR/issue-43106-gating-of-builtin-attrs.rs:632:17
+ --> $DIR/issue-43106-gating-of-builtin-attrs.rs:632:31
|
LL | mod inner { #![crate_name="0900"] }
- | ^^^^^^^^^^^^^^^^^^^^^
+ | ^^^^^^
warning: crate-level attribute should be an inner attribute: add an exclamation mark: `#![foo]`
- --> $DIR/issue-43106-gating-of-builtin-attrs.rs:635:5
+ --> $DIR/issue-43106-gating-of-builtin-attrs.rs:635:20
|
LL | #[crate_name = "0900"] fn f() { }
- | ^^^^^^^^^^^^^^^^^^^^^^
+ | ^^^^^^
warning: crate-level attribute should be an inner attribute: add an exclamation mark: `#![foo]`
- --> $DIR/issue-43106-gating-of-builtin-attrs.rs:638:5
+ --> $DIR/issue-43106-gating-of-builtin-attrs.rs:638:20
|
LL | #[crate_name = "0900"] struct S;
- | ^^^^^^^^^^^^^^^^^^^^^^
+ | ^^^^^^
warning: crate-level attribute should be an inner attribute: add an exclamation mark: `#![foo]`
- --> $DIR/issue-43106-gating-of-builtin-attrs.rs:641:5
+ --> $DIR/issue-43106-gating-of-builtin-attrs.rs:641:20
|
LL | #[crate_name = "0900"] type T = S;
- | ^^^^^^^^^^^^^^^^^^^^^^
+ | ^^^^^^
warning: crate-level attribute should be an inner attribute: add an exclamation mark: `#![foo]`
- --> $DIR/issue-43106-gating-of-builtin-attrs.rs:644:5
+ --> $DIR/issue-43106-gating-of-builtin-attrs.rs:644:20
|
LL | #[crate_name = "0900"] impl S { }
- | ^^^^^^^^^^^^^^^^^^^^^^
+ | ^^^^^^
warning: crate-level attribute should be in the root module
--> $DIR/issue-43106-gating-of-builtin-attrs.rs:651:17
diff --git a/tests/ui/invalid-compile-flags/print-crate-name-request-malformed-crate-name.rs b/tests/ui/invalid-compile-flags/print-crate-name-request-malformed-crate-name.rs
index c7f3c2c5403d1..32f79daad7075 100644
--- a/tests/ui/invalid-compile-flags/print-crate-name-request-malformed-crate-name.rs
+++ b/tests/ui/invalid-compile-flags/print-crate-name-request-malformed-crate-name.rs
@@ -2,4 +2,4 @@
// See also <https://github.com/rust-lang/rust/issues/122001>.
//@ compile-flags: --print=crate-name
-#![crate_name = concat!("wrapped")] //~ ERROR malformed `crate_name` attribute input
+#![crate_name = concat!("wrapped")] //~ ERROR expected a quoted string literal
diff --git a/tests/ui/invalid-compile-flags/print-crate-name-request-malformed-crate-name.stderr b/tests/ui/invalid-compile-flags/print-crate-name-request-malformed-crate-name.stderr
index 6bf09a2b13171..f7f1c3980741e 100644
--- a/tests/ui/invalid-compile-flags/print-crate-name-request-malformed-crate-name.stderr
+++ b/tests/ui/invalid-compile-flags/print-crate-name-request-malformed-crate-name.stderr
@@ -1,8 +1,9 @@
-error: malformed `crate_name` attribute input
+error[E0539]: expected a quoted string literal
--> $DIR/print-crate-name-request-malformed-crate-name.rs:5:1
|
LL | #![crate_name = concat!("wrapped")]
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![crate_name = "name"]`
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to 1 previous error
+For more information about this error, try `rustc --explain E0539`.
diff --git a/tests/ui/invalid-compile-flags/print-crate-name-request-malformed-crate-name.stdout b/tests/ui/invalid-compile-flags/print-crate-name-request-malformed-crate-name.stdout
new file mode 100644
index 0000000000000..9034e9065eafa
--- /dev/null
+++ b/tests/ui/invalid-compile-flags/print-crate-name-request-malformed-crate-name.stdout
@@ -0,0 +1 @@
+print_crate_name_request_malformed_crate_name
diff --git a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-1.rs b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-1.rs
index 5cf1ae36b42b7..e0675661b0935 100644
--- a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-1.rs
+++ b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-1.rs
@@ -1,4 +1,4 @@
// Ensure we validate `#![crate_name]` on print requests.
//@ compile-flags: --print=file-names
-#![crate_name] //~ ERROR malformed `crate_name` attribute input
+#![crate_name] //~ ERROR malformed `crate_name` attribute: expected to be of the form `#[crate_name = ...]`
diff --git a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-1.stderr b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-1.stderr
index de62aed79fce5..c0d0872b65afa 100644
--- a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-1.stderr
+++ b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-1.stderr
@@ -1,8 +1,9 @@
-error: malformed `crate_name` attribute input
+error[E0539]: malformed `crate_name` attribute: expected to be of the form `#[crate_name = ...]`
--> $DIR/print-file-names-request-malformed-crate-name-1.rs:4:1
|
LL | #![crate_name]
- | ^^^^^^^^^^^^^^ help: must be of the form: `#![crate_name = "name"]`
+ | ^^^^^^^^^^^^^^
error: aborting due to 1 previous error
+For more information about this error, try `rustc --explain E0539`.
diff --git a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-1.stdout b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-1.stdout
new file mode 100644
index 0000000000000..bc5a0ae26fd6c
--- /dev/null
+++ b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-1.stdout
@@ -0,0 +1 @@
+print-file-names-request-malformed-crate-name-1
diff --git a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-2.rs b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-2.rs
index 13c9d1e002739..787860a278b55 100644
--- a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-2.rs
+++ b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-2.rs
@@ -3,5 +3,4 @@
// See also <https://github.com/rust-lang/rust/issues/122001>.
//@ compile-flags: --print=file-names
-#![crate_name = "this_one_is_okay"]
-#![crate_name = concat!("this_one_is_not")] //~ ERROR malformed `crate_name` attribute input
+#![crate_name = concat!("this_one_is_not")] //~ ERROR expected a quoted string literal
diff --git a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-2.stderr b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-2.stderr
index 42c33de12210d..dbe9f960a9036 100644
--- a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-2.stderr
+++ b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-2.stderr
@@ -1,8 +1,9 @@
-error: malformed `crate_name` attribute input
- --> $DIR/print-file-names-request-malformed-crate-name-2.rs:7:1
+error[E0539]: expected a quoted string literal
+ --> $DIR/print-file-names-request-malformed-crate-name-2.rs:6:1
|
LL | #![crate_name = concat!("this_one_is_not")]
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![crate_name = "name"]`
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to 1 previous error
+For more information about this error, try `rustc --explain E0539`.
diff --git a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-2.stdout b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-2.stdout
new file mode 100644
index 0000000000000..872156f0db762
--- /dev/null
+++ b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-2.stdout
@@ -0,0 +1 @@
+print-file-names-request-malformed-crate-name-2
diff --git a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-3.rs b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-3.rs
new file mode 100644
index 0000000000000..2c8a94eaee59e
--- /dev/null
+++ b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-3.rs
@@ -0,0 +1,7 @@
+// Ensure that we validate *all* `#![crate_name]`s on print requests, not just the first,
+// and that we reject macro calls inside of them.
+// See also <https://github.com/rust-lang/rust/issues/122001>.
+
+//@check-pass
+//@ compile-flags: --print=file-names
+#![crate_name = "this_one_is_okay"]
diff --git a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-3.stdout b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-3.stdout
new file mode 100644
index 0000000000000..ae84025106c73
--- /dev/null
+++ b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name-3.stdout
@@ -0,0 +1 @@
+this_one_is_okay
diff --git a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name.rs b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name.rs
index 5fe8bd7945f4a..74ce4d39d0a59 100644
--- a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name.rs
+++ b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name.rs
@@ -2,4 +2,4 @@
// See also <https://github.com/rust-lang/rust/issues/122001>.
//@ compile-flags: --print=file-names
-#![crate_name = concat!("wrapped")] //~ ERROR malformed `crate_name` attribute input
+#![crate_name = concat!("wrapped")] //~ ERROR expected a quoted string literal
diff --git a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name.stderr b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name.stderr
index cb5ffaab9ca20..9865fdc7e3637 100644
--- a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name.stderr
+++ b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name.stderr
@@ -1,8 +1,9 @@
-error: malformed `crate_name` attribute input
+error[E0539]: expected a quoted string literal
--> $DIR/print-file-names-request-malformed-crate-name.rs:5:1
|
LL | #![crate_name = concat!("wrapped")]
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![crate_name = "name"]`
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to 1 previous error
+For more information about this error, try `rustc --explain E0539`.
diff --git a/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name.stdout b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name.stdout
new file mode 100644
index 0000000000000..04b42a204203f
--- /dev/null
+++ b/tests/ui/invalid-compile-flags/print-file-names-request-malformed-crate-name.stdout
@@ -0,0 +1 @@
+print-file-names-request-malformed-crate-name
diff --git a/tests/ui/lint/unused/unused-attr-duplicate.rs b/tests/ui/lint/unused/unused-attr-duplicate.rs
index 407af40654e8b..128eded6ee955 100644
--- a/tests/ui/lint/unused/unused-attr-duplicate.rs
+++ b/tests/ui/lint/unused/unused-attr-duplicate.rs
@@ -11,8 +11,10 @@
// - no_main: extra setup
#![deny(unused_attributes)]
#![crate_name = "unused_attr_duplicate"]
-#![crate_name = "unused_attr_duplicate2"] //~ ERROR unused attribute
-//~^ WARN this was previously accepted
+#![crate_name = "unused_attr_duplicate2"] //~ ERROR multiple `crate_name` attributes
+//~^ ERROR multiple `crate_name` attributes
+// FIXME(jdonszelmann) this error is given twice now. I'll fix this in the near future redoing how
+// duplicates are checked.
#![recursion_limit = "128"]
#![recursion_limit = "256"] //~ ERROR unused attribute
//~^ WARN this was previously accepted
diff --git a/tests/ui/lint/unused/unused-attr-duplicate.stderr b/tests/ui/lint/unused/unused-attr-duplicate.stderr
index 769b174874b96..d781daad193d0 100644
--- a/tests/ui/lint/unused/unused-attr-duplicate.stderr
+++ b/tests/ui/lint/unused/unused-attr-duplicate.stderr
@@ -1,11 +1,36 @@
+error: multiple `crate_name` attributes
+ --> $DIR/unused-attr-duplicate.rs:14:1
+ |
+LL | #![crate_name = "unused_attr_duplicate2"]
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute
+ |
+note: attribute also specified here
+ --> $DIR/unused-attr-duplicate.rs:13:1
+ |
+LL | #![crate_name = "unused_attr_duplicate"]
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: multiple `crate_name` attributes
+ --> $DIR/unused-attr-duplicate.rs:14:1
+ |
+LL | #![crate_name = "unused_attr_duplicate2"]
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute
+ |
+note: attribute also specified here
+ --> $DIR/unused-attr-duplicate.rs:13:1
+ |
+LL | #![crate_name = "unused_attr_duplicate"]
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
+
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:33:1
+ --> $DIR/unused-attr-duplicate.rs:35:1
|
LL | #[no_link]
| ^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:32:1
+ --> $DIR/unused-attr-duplicate.rs:34:1
|
LL | #[no_link]
| ^^^^^^^^^^
@@ -16,278 +41,265 @@ LL | #![deny(unused_attributes)]
| ^^^^^^^^^^^^^^^^^
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:37:1
+ --> $DIR/unused-attr-duplicate.rs:39:1
|
LL | #[macro_use]
| ^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:36:1
+ --> $DIR/unused-attr-duplicate.rs:38:1
|
LL | #[macro_use]
| ^^^^^^^^^^^^
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:47:1
+ --> $DIR/unused-attr-duplicate.rs:49:1
|
LL | #[path = "bar.rs"]
| ^^^^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:46:1
+ --> $DIR/unused-attr-duplicate.rs:48:1
|
LL | #[path = "auxiliary/lint_unused_extern_crate.rs"]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:53:1
+ --> $DIR/unused-attr-duplicate.rs:55:1
|
LL | #[ignore = "some text"]
| ^^^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:52:1
+ --> $DIR/unused-attr-duplicate.rs:54:1
|
LL | #[ignore]
| ^^^^^^^^^
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:55:1
+ --> $DIR/unused-attr-duplicate.rs:57:1
|
LL | #[should_panic(expected = "values don't match")]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:54:1
+ --> $DIR/unused-attr-duplicate.rs:56:1
|
LL | #[should_panic]
| ^^^^^^^^^^^^^^^
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:60:1
+ --> $DIR/unused-attr-duplicate.rs:62:1
|
LL | #[must_use = "some message"]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:59:1
+ --> $DIR/unused-attr-duplicate.rs:61:1
|
LL | #[must_use]
| ^^^^^^^^^^^
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:66:1
+ --> $DIR/unused-attr-duplicate.rs:68:1
|
LL | #[non_exhaustive]
| ^^^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:65:1
+ --> $DIR/unused-attr-duplicate.rs:67:1
|
LL | #[non_exhaustive]
| ^^^^^^^^^^^^^^^^^
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:70:1
+ --> $DIR/unused-attr-duplicate.rs:72:1
|
LL | #[automatically_derived]
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:69:1
+ --> $DIR/unused-attr-duplicate.rs:71:1
|
LL | #[automatically_derived]
| ^^^^^^^^^^^^^^^^^^^^^^^^
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:74:1
+ --> $DIR/unused-attr-duplicate.rs:76:1
|
LL | #[inline(never)]
| ^^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:73:1
+ --> $DIR/unused-attr-duplicate.rs:75:1
|
LL | #[inline(always)]
| ^^^^^^^^^^^^^^^^^
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:77:1
+ --> $DIR/unused-attr-duplicate.rs:79:1
|
LL | #[cold]
| ^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:76:1
+ --> $DIR/unused-attr-duplicate.rs:78:1
|
LL | #[cold]
| ^^^^^^^
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:79:1
+ --> $DIR/unused-attr-duplicate.rs:81:1
|
LL | #[track_caller]
| ^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:78:1
+ --> $DIR/unused-attr-duplicate.rs:80:1
|
LL | #[track_caller]
| ^^^^^^^^^^^^^^^
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:92:1
+ --> $DIR/unused-attr-duplicate.rs:94:1
|
LL | #[export_name = "exported_symbol_name"]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:94:1
+ --> $DIR/unused-attr-duplicate.rs:96:1
|
LL | #[export_name = "exported_symbol_name2"]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:98:1
+ --> $DIR/unused-attr-duplicate.rs:100:1
|
LL | #[no_mangle]
| ^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:97:1
+ --> $DIR/unused-attr-duplicate.rs:99:1
|
LL | #[no_mangle]
| ^^^^^^^^^^^^
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:102:1
+ --> $DIR/unused-attr-duplicate.rs:104:1
|
LL | #[used]
| ^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:101:1
+ --> $DIR/unused-attr-duplicate.rs:103:1
|
LL | #[used]
| ^^^^^^^
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:86:5
+ --> $DIR/unused-attr-duplicate.rs:88:5
|
LL | #[link_name = "this_does_not_exist"]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:88:5
+ --> $DIR/unused-attr-duplicate.rs:90:5
|
LL | #[link_name = "rust_dbg_extern_identity_u32"]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:14:1
- |
-LL | #![crate_name = "unused_attr_duplicate2"]
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute
- |
-note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:13:1
- |
-LL | #![crate_name = "unused_attr_duplicate"]
- | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
-
-error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:17:1
+ --> $DIR/unused-attr-duplicate.rs:19:1
|
LL | #![recursion_limit = "256"]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:16:1
+ --> $DIR/unused-attr-duplicate.rs:18:1
|
LL | #![recursion_limit = "128"]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:20:1
+ --> $DIR/unused-attr-duplicate.rs:22:1
|
LL | #![type_length_limit = "1"]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:19:1
+ --> $DIR/unused-attr-duplicate.rs:21:1
|
LL | #![type_length_limit = "1048576"]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:23:1
+ --> $DIR/unused-attr-duplicate.rs:25:1
|
LL | #![no_std]
| ^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:22:1
+ --> $DIR/unused-attr-duplicate.rs:24:1
|
LL | #![no_std]
| ^^^^^^^^^^
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:25:1
+ --> $DIR/unused-attr-duplicate.rs:27:1
|
LL | #![no_implicit_prelude]
| ^^^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:24:1
+ --> $DIR/unused-attr-duplicate.rs:26:1
|
LL | #![no_implicit_prelude]
| ^^^^^^^^^^^^^^^^^^^^^^^
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:27:1
+ --> $DIR/unused-attr-duplicate.rs:29:1
|
LL | #![windows_subsystem = "windows"]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:26:1
+ --> $DIR/unused-attr-duplicate.rs:28:1
|
LL | #![windows_subsystem = "console"]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:30:1
+ --> $DIR/unused-attr-duplicate.rs:32:1
|
LL | #![no_builtins]
| ^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:29:1
+ --> $DIR/unused-attr-duplicate.rs:31:1
|
LL | #![no_builtins]
| ^^^^^^^^^^^^^^^
error: unused attribute
- --> $DIR/unused-attr-duplicate.rs:40:5
+ --> $DIR/unused-attr-duplicate.rs:42:5
|
LL | #[macro_export]
| ^^^^^^^^^^^^^^^ help: remove this attribute
|
note: attribute also specified here
- --> $DIR/unused-attr-duplicate.rs:39:5
+ --> $DIR/unused-attr-duplicate.rs:41:5
|
LL | #[macro_export]
| ^^^^^^^^^^^^^^^
-error: aborting due to 23 previous errors
+error: aborting due to 24 previous errors