Skip to content

Commit 7558b4b

Browse files
JonathanBrouwerJonathanBrouwer
committed
Port #[non_exhaustive] to the new attribute parsing infrastructure
Signed-off-by: Jonathan Brouwer <[email protected]>
1 parent 8b0e694 commit 7558b4b

File tree

17 files changed

+101
-50
lines changed

17 files changed

+101
-50
lines changed

‎compiler/rustc_attr_data_structures/src/attributes.rs

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

284+
/// Represents `#[non_exhaustive]`
285+
NonExhaustive(Span),
286+
284287
/// Represents `#[optimize(size|speed)]`
285288
Optimize(OptimizeAttr, Span),
286289

‎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
@@ -35,6 +35,7 @@ pub(crate) mod link_attrs;
3535
pub(crate) mod lint_helpers;
3636
pub(crate) mod loop_match;
3737
pub(crate) mod must_use;
38+
pub(crate) mod non_exhaustive;
3839
pub(crate) mod repr;
3940
pub(crate) mod rustc_internal;
4041
pub(crate) mod semantics;

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
use rustc_attr_data_structures::AttributeKind;
2+
use rustc_feature::{AttributeTemplate, template};
3+
use rustc_span::{Symbol, sym};
4+
5+
use crate::attributes::{AttributeOrder, OnDuplicate, SingleAttributeParser};
6+
use crate::context::{AcceptContext, Stage};
7+
use crate::parser::ArgParser;
8+
9+
pub(crate) struct NonExhaustiveParser;
10+
11+
impl<S: Stage> SingleAttributeParser<S> for NonExhaustiveParser {
12+
const PATH: &[Symbol] = &[sym::non_exhaustive];
13+
const ATTRIBUTE_ORDER: AttributeOrder = AttributeOrder::KeepLast;
14+
const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Warn;
15+
16+
const TEMPLATE: AttributeTemplate = template!(Word);
17+
18+
fn convert(cx: &mut AcceptContext<'_, '_, S>, args: &ArgParser<'_>) -> Option<AttributeKind> {
19+
if let Err(span) = args.no_args() {
20+
cx.expected_no_args(span);
21+
return None;
22+
}
23+
Some(AttributeKind::NonExhaustive(cx.attr_span))
24+
}
25+
}

‎compiler/rustc_attr_parsing/src/context.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ use crate::attributes::link_attrs::{LinkNameParser, LinkSectionParser};
2626
use crate::attributes::lint_helpers::{AsPtrParser, PubTransparentParser};
2727
use crate::attributes::loop_match::{ConstContinueParser, LoopMatchParser};
2828
use crate::attributes::must_use::MustUseParser;
29+
use crate::attributes::non_exhaustive::NonExhaustiveParser;
2930
use crate::attributes::repr::{AlignParser, ReprParser};
3031
use crate::attributes::rustc_internal::{
3132
RustcLayoutScalarValidRangeEnd, RustcLayoutScalarValidRangeStart,
@@ -132,6 +133,7 @@ attribute_parsers!(
132133
Single<MayDangleParser>,
133134
Single<MustUseParser>,
134135
Single<NoMangleParser>,
136+
Single<NonExhaustiveParser>,
135137
Single<OptimizeParser>,
136138
Single<PubTransparentParser>,
137139
Single<RustcForceInlineParser>,

‎compiler/rustc_hir_analysis/src/collect.rs

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

‎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
@@ -300,6 +300,7 @@ fn emit_malformed_attribute(
300300
| sym::cold
301301
| sym::naked
302302
| sym::no_mangle
303+
| sym::non_exhaustive
303304
| sym::must_use
304305
| sym::track_caller
305306
| sym::link_name

‎compiler/rustc_passes/src/check_attr.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,9 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
188188
Attribute::Parsed(AttributeKind::TrackCaller(attr_span)) => {
189189
self.check_track_caller(hir_id, *attr_span, attrs, span, target)
190190
}
191+
Attribute::Parsed(AttributeKind::NonExhaustive(attr_span)) => {
192+
self.check_non_exhaustive(hir_id, *attr_span, span, target, item)
193+
}
191194
Attribute::Parsed(
192195
AttributeKind::RustcLayoutScalarValidRangeStart(_num, attr_span)
193196
| AttributeKind::RustcLayoutScalarValidRangeEnd(_num, attr_span),
@@ -228,7 +231,6 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
228231
[sym::no_sanitize, ..] => {
229232
self.check_no_sanitize(attr, span, target)
230233
}
231-
[sym::non_exhaustive, ..] => self.check_non_exhaustive(hir_id, attr, span, target, item),
232234
[sym::marker, ..] => self.check_marker(hir_id, attr, span, target),
233235
[sym::target_feature, ..] => {
234236
self.check_target_feature(hir_id, attr, span, target, attrs)
@@ -755,7 +757,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
755757
fn check_non_exhaustive(
756758
&self,
757759
hir_id: HirId,
758-
attr: &Attribute,
760+
attr_span: Span,
759761
span: Span,
760762
target: Target,
761763
item: Option<ItemLike<'_>>,
@@ -770,7 +772,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
770772
&& fields.iter().any(|f| f.default.is_some())
771773
{
772774
self.dcx().emit_err(errors::NonExhaustiveWithDefaultFieldValues {
773-
attr_span: attr.span(),
775+
attr_span,
774776
defn_span: span,
775777
});
776778
}
@@ -781,13 +783,11 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
781783
// erroneously allowed it and some crates used it accidentally, to be compatible
782784
// with crates depending on them, we can't throw an error here.
783785
Target::Field | Target::Arm | Target::MacroDef => {
784-
self.inline_attr_str_error_with_macro_def(hir_id, attr.span(), "non_exhaustive");
786+
self.inline_attr_str_error_with_macro_def(hir_id, attr_span, "non_exhaustive");
785787
}
786788
_ => {
787-
self.dcx().emit_err(errors::NonExhaustiveWrongLocation {
788-
attr_span: attr.span(),
789-
defn_span: span,
790-
});
789+
self.dcx()
790+
.emit_err(errors::NonExhaustiveWrongLocation { attr_span, defn_span: span });
791791
}
792792
}
793793
}

‎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);

0 commit comments

Comments
 (0)