Skip to content

Commit a494898

Browse files
JonathanBrouwerJonathanBrouwer
committed
Port #[non_exhaustive] to the new attribute parsing infrastructure
1 parent 1b61d43 commit a494898

File tree

17 files changed

+88
-49
lines changed

17 files changed

+88
-49
lines changed

‎compiler/rustc_attr_data_structures/src/attributes.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,9 @@ pub enum AttributeKind {
284284
/// Represents `#[no_mangle]`
285285
NoMangle(Span),
286286

287+
/// Represents `#[non_exhaustive]`
288+
NonExhaustive(Span),
289+
287290
/// Represents `#[optimize(size|speed)]`
288291
Optimize(OptimizeAttr, Span),
289292

‎compiler/rustc_attr_data_structures/src/encode_cross_crate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ impl AttributeKind {
2626
Inline(..) => No,
2727
LinkSection { .. } => No,
2828
MacroTransparency(..) => Yes,
29+
NonExhaustive(..) => Yes,
2930
Repr(..) => No,
3031
Stability { .. } => Yes,
3132
Cold(..) => No,

‎compiler/rustc_attr_parsing/src/attributes/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ pub(crate) mod lint_helpers;
3636
pub(crate) mod loop_match;
3737
pub(crate) mod must_use;
3838
pub(crate) mod no_implicit_prelude;
39+
pub(crate) mod non_exhaustive;
3940
pub(crate) mod repr;
4041
pub(crate) mod rustc_internal;
4142
pub(crate) mod semantics;

‎compiler/rustc_attr_parsing/src/attributes/non_exhaustive.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
use rustc_attr_data_structures::AttributeKind;
2+
use rustc_span::{Span, Symbol, sym};
3+
4+
use crate::attributes::{NoArgsAttributeParser, OnDuplicate};
5+
use crate::context::Stage;
6+
7+
pub(crate) struct NonExhaustiveParser;
8+
9+
impl<S: Stage> NoArgsAttributeParser<S> for NonExhaustiveParser {
10+
const PATH: &[Symbol] = &[sym::non_exhaustive];
11+
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Warn;
12+
const CREATE: fn(Span) -> AttributeKind = AttributeKind::NonExhaustive;
13+
}

‎compiler/rustc_attr_parsing/src/context.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ use crate::attributes::lint_helpers::{AsPtrParser, PubTransparentParser};
2727
use crate::attributes::loop_match::{ConstContinueParser, LoopMatchParser};
2828
use crate::attributes::must_use::MustUseParser;
2929
use crate::attributes::no_implicit_prelude::NoImplicitPreludeParser;
30+
use crate::attributes::non_exhaustive::NonExhaustiveParser;
3031
use crate::attributes::repr::{AlignParser, ReprParser};
3132
use crate::attributes::rustc_internal::{
3233
RustcLayoutScalarValidRangeEnd, RustcLayoutScalarValidRangeStart,
@@ -144,6 +145,7 @@ attribute_parsers!(
144145
Single<WithoutArgs<MayDangleParser>>,
145146
Single<WithoutArgs<NoImplicitPreludeParser>>,
146147
Single<WithoutArgs<NoMangleParser>>,
148+
Single<WithoutArgs<NonExhaustiveParser>>,
147149
Single<WithoutArgs<PubTransparentParser>>,
148150
Single<WithoutArgs<TrackCallerParser>>,
149151
// tidy-alphabetical-end

‎compiler/rustc_hir_analysis/src/collect.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -779,9 +779,11 @@ fn lower_variant<'tcx>(
779779
fields,
780780
parent_did.to_def_id(),
781781
recovered,
782-
adt_kind == AdtKind::Struct && tcx.has_attr(parent_did, sym::non_exhaustive)
783-
|| variant_did
784-
.is_some_and(|variant_did| tcx.has_attr(variant_did, sym::non_exhaustive)),
782+
adt_kind == AdtKind::Struct
783+
&& find_attr!(tcx.get_all_attrs(parent_did), AttributeKind::NonExhaustive(..))
784+
|| variant_did.is_some_and(|variant_did| {
785+
find_attr!(tcx.get_all_attrs(variant_did), AttributeKind::NonExhaustive(..))
786+
}),
785787
)
786788
}
787789

‎compiler/rustc_middle/src/ty/adt.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use std::ops::Range;
44
use std::str;
55

66
use rustc_abi::{FIRST_VARIANT, ReprOptions, VariantIdx};
7+
use rustc_attr_data_structures::{AttributeKind, find_attr};
78
use rustc_data_structures::fingerprint::Fingerprint;
89
use rustc_data_structures::fx::FxHashMap;
910
use rustc_data_structures::intern::Interned;
@@ -278,7 +279,9 @@ impl AdtDefData {
278279
debug!("AdtDef::new({:?}, {:?}, {:?}, {:?})", did, kind, variants, repr);
279280
let mut flags = AdtFlags::NO_ADT_FLAGS;
280281

281-
if kind == AdtKind::Enum && tcx.has_attr(did, sym::non_exhaustive) {
282+
if kind == AdtKind::Enum
283+
&& find_attr!(tcx.get_all_attrs(did), AttributeKind::NonExhaustive(..))
284+
{
282285
debug!("found non-exhaustive variant list for {:?}", did);
283286
flags = flags | AdtFlags::IS_VARIANT_LIST_NON_EXHAUSTIVE;
284287
}

‎compiler/rustc_parse/src/validate_attr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ fn emit_malformed_attribute(
302302
| sym::rustc_allow_const_fn_unstable
303303
| sym::naked
304304
| sym::no_mangle
305+
| sym::non_exhaustive
305306
| sym::must_use
306307
| sym::track_caller
307308
| sym::link_name

‎compiler/rustc_passes/src/check_attr.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,9 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
194194
Attribute::Parsed(AttributeKind::TrackCaller(attr_span)) => {
195195
self.check_track_caller(hir_id, *attr_span, attrs, span, target)
196196
}
197+
Attribute::Parsed(AttributeKind::NonExhaustive(attr_span)) => {
198+
self.check_non_exhaustive(hir_id, *attr_span, span, target, item)
199+
}
197200
Attribute::Parsed(
198201
AttributeKind::RustcLayoutScalarValidRangeStart(_num, attr_span)
199202
| AttributeKind::RustcLayoutScalarValidRangeEnd(_num, attr_span),
@@ -234,7 +237,6 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
234237
[sym::no_sanitize, ..] => {
235238
self.check_no_sanitize(attr, span, target)
236239
}
237-
[sym::non_exhaustive, ..] => self.check_non_exhaustive(hir_id, attr, span, target, item),
238240
[sym::marker, ..] => self.check_marker(hir_id, attr, span, target),
239241
[sym::thread_local, ..] => self.check_thread_local(attr, span, target),
240242
[sym::doc, ..] => self.check_doc_attrs(
@@ -777,7 +779,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
777779
fn check_non_exhaustive(
778780
&self,
779781
hir_id: HirId,
780-
attr: &Attribute,
782+
attr_span: Span,
781783
span: Span,
782784
target: Target,
783785
item: Option<ItemLike<'_>>,
@@ -792,7 +794,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
792794
&& fields.iter().any(|f| f.default.is_some())
793795
{
794796
self.dcx().emit_err(errors::NonExhaustiveWithDefaultFieldValues {
795-
attr_span: attr.span(),
797+
attr_span,
796798
defn_span: span,
797799
});
798800
}
@@ -803,13 +805,11 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
803805
// erroneously allowed it and some crates used it accidentally, to be compatible
804806
// with crates depending on them, we can't throw an error here.
805807
Target::Field | Target::Arm | Target::MacroDef => {
806-
self.inline_attr_str_error_with_macro_def(hir_id, attr.span(), "non_exhaustive");
808+
self.inline_attr_str_error_with_macro_def(hir_id, attr_span, "non_exhaustive");
807809
}
808810
_ => {
809-
self.dcx().emit_err(errors::NonExhaustiveWrongLocation {
810-
attr_span: attr.span(),
811-
defn_span: span,
812-
});
811+
self.dcx()
812+
.emit_err(errors::NonExhaustiveWrongLocation { attr_span, defn_span: span });
813813
}
814814
}
815815
}

‎compiler/rustc_resolve/src/diagnostics.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use rustc_ast::{
55
self as ast, CRATE_NODE_ID, Crate, ItemKind, MetaItemInner, MetaItemKind, ModKind, NodeId, Path,
66
};
77
use rustc_ast_pretty::pprust;
8-
use rustc_attr_data_structures::{self as attr, Stability};
8+
use rustc_attr_data_structures::{self as attr, AttributeKind, Stability, find_attr};
99
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
1010
use rustc_data_structures::unord::{UnordMap, UnordSet};
1111
use rustc_errors::codes::*;
@@ -1998,9 +1998,9 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
19981998
// Otherwise, point out if the struct has any private fields.
19991999
if let Some(def_id) = res.opt_def_id()
20002000
&& !def_id.is_local()
2001-
&& let Some(attr) = self.tcx.get_attr(def_id, sym::non_exhaustive)
2001+
&& let Some(attr_span) = find_attr!(self.tcx.get_all_attrs(def_id), AttributeKind::NonExhaustive(span) => *span)
20022002
{
2003-
non_exhaustive = Some(attr.span());
2003+
non_exhaustive = Some(attr_span);
20042004
} else if let Some(span) = ctor_fields_span {
20052005
let label = errors::ConstructorPrivateIfAnyFieldPrivate { span };
20062006
err.subdiagnostic(label);

‎src/librustdoc/clean/types.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ impl Item {
621621
}
622622

623623
pub(crate) fn is_non_exhaustive(&self) -> bool {
624-
self.attrs.other_attrs.iter().any(|a| a.has_name(sym::non_exhaustive))
624+
find_attr!(&self.attrs.other_attrs, AttributeKind::NonExhaustive(..))
625625
}
626626

627627
/// Returns a documentation-level item type from the item.
@@ -776,6 +776,8 @@ impl Item {
776776
} else if let hir::Attribute::Parsed(AttributeKind::ExportName { name, .. }) = attr
777777
{
778778
Some(format!("#[export_name = \"{name}\"]"))
779+
} else if let hir::Attribute::Parsed(AttributeKind::NonExhaustive(..)) = attr {
780+
Some("#[non_exhaustive]".to_string())
779781
} else if is_json {
780782
match attr {
781783
// rustdoc-json stores this in `Item::deprecation`, so we

‎src/tools/clippy/clippy_lints/src/exhaustive_items.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ use rustc_errors::Applicability;
44
use rustc_hir::{Item, ItemKind};
55
use rustc_lint::{LateContext, LateLintPass};
66
use rustc_session::declare_lint_pass;
7-
use rustc_span::sym;
7+
use rustc_attr_data_structures::AttributeKind;
8+
use rustc_attr_data_structures::find_attr;
9+
810

911
declare_clippy_lint! {
1012
/// ### What it does
@@ -85,7 +87,7 @@ impl LateLintPass<'_> for ExhaustiveItems {
8587
};
8688
if cx.effective_visibilities.is_exported(item.owner_id.def_id)
8789
&& let attrs = cx.tcx.hir_attrs(item.hir_id())
88-
&& !attrs.iter().any(|a| a.has_name(sym::non_exhaustive))
90+
&& !find_attr!(attrs, AttributeKind::NonExhaustive(..))
8991
&& fields.iter().all(|f| cx.tcx.visibility(f.def_id).is_public())
9092
{
9193
span_lint_and_then(cx, lint, item.span, msg, |diag| {

‎src/tools/clippy/clippy_lints/src/manual_non_exhaustive.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@ use clippy_utils::is_doc_hidden;
44
use clippy_utils::msrvs::{self, Msrv};
55
use clippy_utils::source::snippet_indent;
66
use itertools::Itertools;
7-
use rustc_ast::attr;
87
use rustc_data_structures::fx::FxHashSet;
98
use rustc_errors::Applicability;
109
use rustc_hir::def::{CtorKind, CtorOf, DefKind, Res};
1110
use rustc_hir::{Expr, ExprKind, Item, ItemKind, QPath, TyKind, VariantData};
1211
use rustc_lint::{LateContext, LateLintPass};
1312
use rustc_session::impl_lint_pass;
1413
use rustc_span::def_id::LocalDefId;
15-
use rustc_span::{Span, sym};
14+
use rustc_span::Span;
15+
use rustc_attr_data_structures::find_attr;
16+
use rustc_attr_data_structures::AttributeKind;
1617

1718
declare_clippy_lint! {
1819
/// ### What it does
@@ -93,7 +94,7 @@ impl<'tcx> LateLintPass<'tcx> for ManualNonExhaustive {
9394
.then_some((v.def_id, v.span))
9495
});
9596
if let Ok((id, span)) = iter.exactly_one()
96-
&& !attr::contains_name(cx.tcx.hir_attrs(item.hir_id()), sym::non_exhaustive)
97+
&& !find_attr!(cx.tcx.hir_attrs(item.hir_id()), AttributeKind::NonExhaustive(..))
9798
{
9899
self.potential_enums.push((item.owner_id.def_id, id, item.span, span));
99100
}
@@ -113,10 +114,10 @@ impl<'tcx> LateLintPass<'tcx> for ManualNonExhaustive {
113114
item.span,
114115
"this seems like a manual implementation of the non-exhaustive pattern",
115116
|diag| {
116-
if let Some(non_exhaustive) =
117-
attr::find_by_name(cx.tcx.hir_attrs(item.hir_id()), sym::non_exhaustive)
117+
if let Some(non_exhaustive_span) =
118+
find_attr!(cx.tcx.hir_attrs(item.hir_id()), AttributeKind::NonExhaustive(span) => *span)
118119
{
119-
diag.span_note(non_exhaustive.span(), "the struct is already non-exhaustive");
120+
diag.span_note(non_exhaustive_span, "the struct is already non-exhaustive");
120121
} else {
121122
let indent = snippet_indent(cx, item.span).unwrap_or_default();
122123
diag.span_suggestion_verbose(

‎src/tools/clippy/clippy_utils/src/attrs.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ use rustc_middle::ty::{AdtDef, TyCtxt};
77
use rustc_session::Session;
88
use rustc_span::{Span, Symbol};
99
use std::str::FromStr;
10-
10+
use rustc_attr_data_structures::find_attr;
1111
use crate::source::SpanRangeExt;
1212
use crate::{sym, tokenize_with_text};
13+
use rustc_attr_data_structures::AttributeKind;
1314

1415
/// Deprecation status of attributes known by Clippy.
1516
pub enum DeprecationStatus {
@@ -165,13 +166,13 @@ pub fn is_doc_hidden(attrs: &[impl AttributeExt]) -> bool {
165166

166167
pub fn has_non_exhaustive_attr(tcx: TyCtxt<'_>, adt: AdtDef<'_>) -> bool {
167168
adt.is_variant_list_non_exhaustive()
168-
|| tcx.has_attr(adt.did(), sym::non_exhaustive)
169+
|| find_attr!(tcx.get_all_attrs(adt.did()), AttributeKind::NonExhaustive(..))
169170
|| adt.variants().iter().any(|variant_def| {
170-
variant_def.is_field_list_non_exhaustive() || tcx.has_attr(variant_def.def_id, sym::non_exhaustive)
171+
variant_def.is_field_list_non_exhaustive() || find_attr!(tcx.get_all_attrs(variant_def.def_id), AttributeKind::NonExhaustive(..))
171172
})
172173
|| adt
173174
.all_fields()
174-
.any(|field_def| tcx.has_attr(field_def.did, sym::non_exhaustive))
175+
.any(|field_def| find_attr!(tcx.get_all_attrs(field_def.did), AttributeKind::NonExhaustive(..)))
175176
}
176177

177178
/// Checks if the given span contains a `#[cfg(..)]` attribute

‎tests/ui/attributes/malformed-attrs.stderr

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,6 @@ error: malformed `automatically_derived` attribute input
206206
LL | #[automatically_derived = 18]
207207
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#[automatically_derived]`
208208

209-
error: malformed `non_exhaustive` attribute input
210-
--> $DIR/malformed-attrs.rs:196:1
211-
|
212-
LL | #[non_exhaustive = 1]
213-
| ^^^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#[non_exhaustive]`
214-
215209
error: malformed `thread_local` attribute input
216210
--> $DIR/malformed-attrs.rs:202:1
217211
|
@@ -552,6 +546,15 @@ LL | #[rustc_layout_scalar_valid_range_end]
552546
| expected this to be a list
553547
| help: must be of the form: `#[rustc_layout_scalar_valid_range_end(end)]`
554548

549+
error[E0565]: malformed `non_exhaustive` attribute input
550+
--> $DIR/malformed-attrs.rs:196:1
551+
|
552+
LL | #[non_exhaustive = 1]
553+
| ^^^^^^^^^^^^^^^^^---^
554+
| | |
555+
| | didn't expect any arguments here
556+
| help: must be of the form: `#[non_exhaustive]`
557+
555558
error: attribute should be applied to `const fn`
556559
--> $DIR/malformed-attrs.rs:34:1
557560
|

‎tests/ui/lint/unused/unused-attr-duplicate.stderr

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,6 @@ LL | #[should_panic]
6565
| ^^^^^^^^^^^^^^^
6666
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
6767

68-
error: unused attribute
69-
--> $DIR/unused-attr-duplicate.rs:66:1
70-
|
71-
LL | #[non_exhaustive]
72-
| ^^^^^^^^^^^^^^^^^ help: remove this attribute
73-
|
74-
note: attribute also specified here
75-
--> $DIR/unused-attr-duplicate.rs:65:1
76-
|
77-
LL | #[non_exhaustive]
78-
| ^^^^^^^^^^^^^^^^^
79-
8068
error: unused attribute
8169
--> $DIR/unused-attr-duplicate.rs:70:1
8270
|
@@ -190,6 +178,18 @@ LL | #[must_use]
190178
| ^^^^^^^^^^^
191179
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
192180

181+
error: unused attribute
182+
--> $DIR/unused-attr-duplicate.rs:66:1
183+
|
184+
LL | #[non_exhaustive]
185+
| ^^^^^^^^^^^^^^^^^ help: remove this attribute
186+
|
187+
note: attribute also specified here
188+
--> $DIR/unused-attr-duplicate.rs:65:1
189+
|
190+
LL | #[non_exhaustive]
191+
| ^^^^^^^^^^^^^^^^^
192+
193193
error: unused attribute
194194
--> $DIR/unused-attr-duplicate.rs:74:1
195195
|

‎tests/ui/rfcs/rfc-2008-non-exhaustive/invalid-attribute.stderr

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
error: malformed `non_exhaustive` attribute input
1+
error[E0565]: malformed `non_exhaustive` attribute input
22
--> $DIR/invalid-attribute.rs:1:1
33
|
44
LL | #[non_exhaustive(anything)]
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#[non_exhaustive]`
5+
| ^^^^^^^^^^^^^^^^----------^
6+
| | |
7+
| | didn't expect any arguments here
8+
| help: must be of the form: `#[non_exhaustive]`
69

710
error[E0701]: attribute should be applied to a struct or enum
811
--> $DIR/invalid-attribute.rs:5:1
@@ -27,4 +30,5 @@ LL | | }
2730

2831
error: aborting due to 3 previous errors
2932

30-
For more information about this error, try `rustc --explain E0701`.
33+
Some errors have detailed explanations: E0565, E0701.
34+
For more information about an error, try `rustc --explain E0565`.

0 commit comments

Comments
 (0)