Skip to content

Commit 635f0bc

Browse files
GrigorenkoPVGrigorenkoPV
committed
Audit AllowConstBlockItems 
1 parent 8971bb3 commit 635f0bc

File tree

16 files changed

+100
-41
lines changed

16 files changed

+100
-41
lines changed

‎compiler/rustc_ast/src/ast.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3795,6 +3795,7 @@ impl ConstItemRhs {
37953795

37963796
#[derive(Clone, Encodable, Decodable, Debug, Walkable)]
37973797
pub struct ConstBlockItem {
3798+
// FIXME(const_block_items): current invariant is body.kind == InlineConst
37983799
pub body: Box<Expr>,
37993800
}
38003801

‎compiler/rustc_builtin_macros/src/cfg_eval.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use rustc_expand::base::{Annotatable, ExtCtxt};
99
use rustc_expand::config::StripUnconfigured;
1010
use rustc_expand::configure;
1111
use rustc_feature::Features;
12-
use rustc_parse::parser::{ConstBlockItemsAllowed, ForceCollect, Parser};
12+
use rustc_parse::parser::{AllowConstBlockItems, ForceCollect, Parser};
1313
use rustc_session::Session;
1414
use rustc_span::{Span, sym};
1515
use smallvec::SmallVec;
@@ -114,7 +114,7 @@ impl CfgEval<'_> {
114114
match annotatable {
115115
Annotatable::Item(_) => {
116116
let item =
117-
parser.parse_item(ForceCollect::Yes, ConstBlockItemsAllowed::No)?.unwrap();
117+
parser.parse_item(ForceCollect::Yes, AllowConstBlockItems::Yes)?.unwrap();
118118
Annotatable::Item(self.flat_map_item(item).pop().unwrap())
119119
}
120120
Annotatable::AssocItem(_, ctxt) => {

‎compiler/rustc_builtin_macros/src/source_util.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use rustc_expand::base::{
1313
};
1414
use rustc_expand::module::DirOwnership;
1515
use rustc_parse::lexer::StripTokens;
16-
use rustc_parse::parser::{ConstBlockItemsAllowed, ForceCollect};
16+
use rustc_parse::parser::{AllowConstBlockItems, ForceCollect};
1717
use rustc_parse::{new_parser_from_file, unwrap_or_emit_fatal, utf8_error};
1818
use rustc_session::lint::builtin::INCOMPLETE_INCLUDE;
1919
use rustc_session::parse::ParseSess;
@@ -173,7 +173,7 @@ pub(crate) fn expand_include<'cx>(
173173
));
174174
let mut ret = SmallVec::new();
175175
loop {
176-
match p.parse_item(ForceCollect::No, ConstBlockItemsAllowed::No) {
176+
match p.parse_item(ForceCollect::No, AllowConstBlockItems::Yes) {
177177
Err(err) => {
178178
err.emit();
179179
break;

‎compiler/rustc_expand/src/base.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use rustc_hir::limit::Limit;
2222
use rustc_hir::{Stability, find_attr};
2323
use rustc_lint_defs::RegisteredTools;
2424
use rustc_parse::MACRO_ARGUMENTS;
25-
use rustc_parse::parser::{ConstBlockItemsAllowed, ForceCollect, Parser};
25+
use rustc_parse::parser::{AllowConstBlockItems, ForceCollect, Parser};
2626
use rustc_session::Session;
2727
use rustc_session::config::CollapseMacroDebuginfo;
2828
use rustc_session::parse::ParseSess;
@@ -1497,7 +1497,7 @@ pub(crate) fn stream_pretty_printing_compatibility_hack(
14971497
let mut parser = Parser::new(psess, stream.clone(), None);
14981498
// No need to collect tokens for this simple check.
14991499
parser
1500-
.parse_item(ForceCollect::No, ConstBlockItemsAllowed::No)
1500+
.parse_item(ForceCollect::No, AllowConstBlockItems::No)
15011501
.expect("failed to reparse item")
15021502
.expect("an actual item")
15031503
}

‎compiler/rustc_expand/src/expand.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use rustc_hir::Target;
2121
use rustc_hir::def::MacroKinds;
2222
use rustc_hir::limit::Limit;
2323
use rustc_parse::parser::{
24-
AttemptLocalParseRecovery, CommaRecoveryMode, ConstBlockItemsAllowed, ForceCollect, Parser,
24+
AllowConstBlockItems, AttemptLocalParseRecovery, CommaRecoveryMode, ForceCollect, Parser,
2525
RecoverColon, RecoverComma, token_descr,
2626
};
2727
use rustc_session::Session;
@@ -1096,7 +1096,7 @@ pub fn parse_ast_fragment<'a>(
10961096
Ok(match kind {
10971097
AstFragmentKind::Items => {
10981098
let mut items = SmallVec::new();
1099-
while let Some(item) = this.parse_item(ForceCollect::No, ConstBlockItemsAllowed::No)? {
1099+
while let Some(item) = this.parse_item(ForceCollect::No, AllowConstBlockItems::Yes)? {
11001100
items.push(item);
11011101
}
11021102
AstFragment::Items(items)

‎compiler/rustc_expand/src/proc_macro.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rustc_ast::tokenstream::TokenStream;
22
use rustc_errors::ErrorGuaranteed;
3-
use rustc_parse::parser::{ConstBlockItemsAllowed, ForceCollect, Parser};
3+
use rustc_parse::parser::{AllowConstBlockItems, ForceCollect, Parser};
44
use rustc_session::config::ProcMacroExecutionStrategy;
55
use rustc_span::Span;
66
use rustc_span::profiling::SpannedEventArgRecorder;
@@ -156,7 +156,10 @@ impl MultiItemModifier for DeriveProcMacro {
156156
let mut items = vec![];
157157

158158
loop {
159-
match parser.parse_item(ForceCollect::No, ConstBlockItemsAllowed::No) {
159+
match parser.parse_item(
160+
ForceCollect::No,
161+
if is_stmt { AllowConstBlockItems::No } else { AllowConstBlockItems::Yes },
162+
) {
160163
Ok(None) => break,
161164
Ok(Some(item)) => {
162165
if is_stmt {

‎compiler/rustc_parse/src/parser/attr.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use thin_vec::ThinVec;
99
use tracing::debug;
1010

1111
use super::{
12-
AttrWrapper, Capturing, ConstBlockItemsAllowed, FnParseMode, ForceCollect, Parser, PathStyle,
12+
AllowConstBlockItems, AttrWrapper, Capturing, FnParseMode, ForceCollect, Parser, PathStyle,
1313
Trailing, UsePreAttrPos,
1414
};
1515
use crate::parser::FnContext;
@@ -204,7 +204,7 @@ impl<'a> Parser<'a> {
204204
false,
205205
FnParseMode { req_name: |_, _| true, context: FnContext::Free, req_body: true },
206206
ForceCollect::No,
207-
ConstBlockItemsAllowed::No,
207+
AllowConstBlockItems::Yes,
208208
) {
209209
Ok(Some(item)) => {
210210
// FIXME(#100717)

‎compiler/rustc_parse/src/parser/item.rs‎

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ use tracing::debug;
2222
use super::diagnostics::{ConsumeClosingDelim, dummy_arg};
2323
use super::ty::{AllowPlus, RecoverQPath, RecoverReturnSign};
2424
use super::{
25-
AttrWrapper, ConstBlockItemsAllowed, ExpKeywordPair, ExpTokenPair, FollowedByType,
26-
ForceCollect, Parser, PathStyle, Recovered, Trailing, UsePreAttrPos,
25+
AllowConstBlockItems, AttrWrapper, ExpKeywordPair, ExpTokenPair, FollowedByType, ForceCollect,
26+
Parser, PathStyle, Recovered, Trailing, UsePreAttrPos,
2727
};
2828
use crate::errors::{self, FnPointerCannotBeAsync, FnPointerCannotBeConst, MacroExpandsToAdtField};
2929
use crate::{exp, fluent_generated as fluent};
@@ -69,7 +69,7 @@ impl<'a> Parser<'a> {
6969
// `parse_item` consumes the appropriate semicolons so any leftover is an error.
7070
loop {
7171
while self.maybe_consume_incorrect_semicolon(items.last().map(|x| &**x)) {} // Eat all bad semicolons
72-
let Some(item) = self.parse_item(ForceCollect::No, ConstBlockItemsAllowed::Yes)? else {
72+
let Some(item) = self.parse_item(ForceCollect::No, AllowConstBlockItems::Yes)? else {
7373
break;
7474
};
7575
items.push(item);
@@ -121,19 +121,19 @@ impl<'a> Parser<'a> {
121121
pub fn parse_item(
122122
&mut self,
123123
force_collect: ForceCollect,
124-
const_block_items_allowed: ConstBlockItemsAllowed,
124+
allow_const_block_items: AllowConstBlockItems,
125125
) -> PResult<'a, Option<Box<Item>>> {
126126
let fn_parse_mode =
127127
FnParseMode { req_name: |_, _| true, context: FnContext::Free, req_body: true };
128-
self.parse_item_(fn_parse_mode, force_collect, const_block_items_allowed)
128+
self.parse_item_(fn_parse_mode, force_collect, allow_const_block_items)
129129
.map(|i| i.map(Box::new))
130130
}
131131

132132
fn parse_item_(
133133
&mut self,
134134
fn_parse_mode: FnParseMode,
135135
force_collect: ForceCollect,
136-
const_block_items_allowed: ConstBlockItemsAllowed,
136+
const_block_items_allowed: AllowConstBlockItems,
137137
) -> PResult<'a, Option<Item>> {
138138
self.recover_vcs_conflict_marker();
139139
let attrs = self.parse_outer_attributes()?;
@@ -155,10 +155,10 @@ impl<'a> Parser<'a> {
155155
attrs_allowed: bool,
156156
fn_parse_mode: FnParseMode,
157157
force_collect: ForceCollect,
158-
const_block_items_allowed: ConstBlockItemsAllowed,
158+
allow_const_block_items: AllowConstBlockItems,
159159
) -> PResult<'a, Option<Item>> {
160160
if let Some(item) = self.eat_metavar_seq(MetaVarKind::Item, |this| {
161-
this.parse_item(ForceCollect::Yes, const_block_items_allowed)
161+
this.parse_item(ForceCollect::Yes, allow_const_block_items)
162162
}) {
163163
let mut item = item.expect("an actual item");
164164
attrs.prepend_to_nt_inner(&mut item.attrs);
@@ -172,7 +172,7 @@ impl<'a> Parser<'a> {
172172
let kind = this.parse_item_kind(
173173
&mut attrs,
174174
mac_allowed,
175-
const_block_items_allowed,
175+
allow_const_block_items,
176176
lo,
177177
&vis,
178178
&mut def,
@@ -219,7 +219,7 @@ impl<'a> Parser<'a> {
219219
&mut self,
220220
attrs: &mut AttrVec,
221221
macros_allowed: bool,
222-
const_block_items_allowed: ConstBlockItemsAllowed,
222+
allow_const_block_items: AllowConstBlockItems,
223223
lo: Span,
224224
vis: &Visibility,
225225
def: &mut Defaultness,
@@ -267,12 +267,16 @@ impl<'a> Parser<'a> {
267267
} else if self.check_impl_frontmatter() {
268268
// IMPL ITEM
269269
self.parse_item_impl(attrs, def_())?
270-
} else if let ConstBlockItemsAllowed::Yes = const_block_items_allowed
270+
} else if let AllowConstBlockItems::Yes | AllowConstBlockItems::DoesNotMatter =
271+
allow_const_block_items
271272
&& self.token.is_keyword(kw::Const)
272273
&& self.look_ahead(1, |t| *t == token::OpenBrace || t.is_metavar_block())
273274
{
274275
// CONST BLOCK ITEM
275276
self.psess.gated_spans.gate(sym::const_block_items, self.token.span);
277+
if let AllowConstBlockItems::DoesNotMatter = allow_const_block_items {
278+
debug!("Parsing a const block item that does not matter: {:?}", self.token.span);
279+
};
276280
ItemKind::ConstBlock(ConstBlockItem { body: self.parse_expr()? })
277281
} else if let Const::Yes(const_span) = self.parse_constness(case) {
278282
// CONST ITEM
@@ -333,7 +337,7 @@ impl<'a> Parser<'a> {
333337
return self.parse_item_kind(
334338
attrs,
335339
macros_allowed,
336-
const_block_items_allowed,
340+
allow_const_block_items,
337341
lo,
338342
vis,
339343
def,
@@ -1014,8 +1018,13 @@ impl<'a> Parser<'a> {
10141018
fn_parse_mode: FnParseMode,
10151019
force_collect: ForceCollect,
10161020
) -> PResult<'a, Option<Option<Box<AssocItem>>>> {
1017-
Ok(self.parse_item_(fn_parse_mode, force_collect, ConstBlockItemsAllowed::No)?.map(
1018-
|Item { attrs, id, span, vis, kind, tokens }| {
1021+
Ok(self
1022+
.parse_item_(
1023+
fn_parse_mode,
1024+
force_collect,
1025+
AllowConstBlockItems::DoesNotMatter, // due to `AssocItemKind::try_from` below
1026+
)?
1027+
.map(|Item { attrs, id, span, vis, kind, tokens }| {
10191028
let kind = match AssocItemKind::try_from(kind) {
10201029
Ok(kind) => kind,
10211030
Err(kind) => match kind {
@@ -1042,8 +1051,7 @@ impl<'a> Parser<'a> {
10421051
},
10431052
};
10441053
Some(Box::new(Item { attrs, id, span, vis, kind, tokens }))
1045-
},
1046-
))
1054+
}))
10471055
}
10481056

10491057
/// Parses a `type` alias with the following grammar:
@@ -1266,8 +1274,13 @@ impl<'a> Parser<'a> {
12661274
context: FnContext::Free,
12671275
req_body: false,
12681276
};
1269-
Ok(self.parse_item_(fn_parse_mode, force_collect, ConstBlockItemsAllowed::No)?.map(
1270-
|Item { attrs, id, span, vis, kind, tokens }| {
1277+
Ok(self
1278+
.parse_item_(
1279+
fn_parse_mode,
1280+
force_collect,
1281+
AllowConstBlockItems::DoesNotMatter, // due to `ForeignItemKind::try_from` below
1282+
)?
1283+
.map(|Item { attrs, id, span, vis, kind, tokens }| {
12711284
let kind = match ForeignItemKind::try_from(kind) {
12721285
Ok(kind) => kind,
12731286
Err(kind) => match kind {
@@ -1294,8 +1307,7 @@ impl<'a> Parser<'a> {
12941307
},
12951308
};
12961309
Some(Box::new(Item { attrs, id, span, vis, kind, tokens }))
1297-
},
1298-
))
1310+
}))
12991311
}
13001312

13011313
fn error_bad_item_kind<T>(&self, span: Span, kind: &ItemKind, ctx: &'static str) -> Option<T> {
@@ -2331,7 +2343,10 @@ impl<'a> Parser<'a> {
23312343
{
23322344
let kw_token = self.token;
23332345
let kw_str = pprust::token_to_string(&kw_token);
2334-
let item = self.parse_item(ForceCollect::No, ConstBlockItemsAllowed::No)?;
2346+
let item = self.parse_item(
2347+
ForceCollect::No,
2348+
AllowConstBlockItems::DoesNotMatter, // self.token != kw::Const
2349+
)?;
23352350
let mut item = item.unwrap().span;
23362351
if self.token == token::Comma {
23372352
item = item.to(self.token.span);

‎compiler/rustc_parse/src/parser/mod.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,11 @@ pub enum ForceCollect {
146146
}
147147

148148
/// Whether to accept `const { ... }` as a shorthand for `const _: () = const { ... }`.
149-
#[derive(Clone, Copy, Debug, PartialEq)]
150-
pub enum ConstBlockItemsAllowed {
149+
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
150+
pub enum AllowConstBlockItems {
151151
Yes,
152152
No,
153+
DoesNotMatter,
153154
}
154155

155156
/// If the next tokens are ill-formed `$ty::` recover them as `<$ty>::`.

‎compiler/rustc_parse/src/parser/nonterminal.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use rustc_span::{Ident, kw};
77
use crate::errors::UnexpectedNonterminal;
88
use crate::parser::pat::{CommaRecoveryMode, RecoverColon, RecoverComma};
99
use crate::parser::{
10-
ConstBlockItemsAllowed, FollowedByType, ForceCollect, ParseNtResult, Parser, PathStyle,
10+
AllowConstBlockItems, FollowedByType, ForceCollect, ParseNtResult, Parser, PathStyle,
1111
};
1212

1313
impl<'a> Parser<'a> {
@@ -121,7 +121,7 @@ impl<'a> Parser<'a> {
121121
// Note that TT is treated differently to all the others.
122122
NonterminalKind::TT => Ok(ParseNtResult::Tt(self.parse_token_tree())),
123123
NonterminalKind::Item => match self
124-
.parse_item(ForceCollect::Yes, ConstBlockItemsAllowed::Yes)?
124+
.parse_item(ForceCollect::Yes, AllowConstBlockItems::Yes)?
125125
{
126126
Some(item) => Ok(ParseNtResult::Item(item)),
127127
None => Err(self.dcx().create_err(UnexpectedNonterminal::Item(self.token.span))),

0 commit comments

Comments
 (0)