Auto merge of #138083 - nnethercote:rm-NtItem-NtStmt, r=petrochenkov

Remove `NtItem` and `NtStmt`
Another piece of #124141.
r? `@petrochenkov`

Author: bors

compiler/rustc_ast/src/ast_traits.rs

@@ -209,16 +209,12 @@ impl HasTokens for Attribute {
 implHasTokensforNonterminal{
 fntokens(&self) -> Option<&LazyAttrTokenStream>{
 matchself{
-Nonterminal::NtItem(item) => item.tokens(),
-Nonterminal::NtStmt(stmt) => stmt.tokens(),
 Nonterminal::NtExpr(expr) | Nonterminal::NtLiteral(expr) => expr.tokens(),
 Nonterminal::NtBlock(block) => block.tokens(),
 }
 }
 fntokens_mut(&mutself) -> Option<&mutOption<LazyAttrTokenStream>>{
 matchself{
-Nonterminal::NtItem(item) => item.tokens_mut(),
-Nonterminal::NtStmt(stmt) => stmt.tokens_mut(),
 Nonterminal::NtExpr(expr) | Nonterminal::NtLiteral(expr) => expr.tokens_mut(),
 Nonterminal::NtBlock(block) => block.tokens_mut(),
 }

compiler/rustc_ast/src/lib.rs

@@ -6,6 +6,7 @@
 
 // tidy-alphabetical-start
 #![allow(internal_features)]
+#![cfg_attr(doc, recursion_limit = "256")]// FIXME(nnethercote): will be removed by #124141
 #![doc(
  html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
  test(attr(deny(warnings)))

compiler/rustc_ast/src/mut_visit.rs

@@ -895,19 +895,7 @@ pub fn visit_token<T: MutVisitor>(vis: &mut T, t: &mut Token) {
 // multiple items there....
 fnvisit_nonterminal<T:MutVisitor>(vis:&mutT,nt:&mut token::Nonterminal){
 match nt {
- token::NtItem(item) => visit_clobber(item, |item| {
-// This is probably okay, because the only visitors likely to
-// peek inside interpolated nodes will be renamings/markings,
-// which map single items to single items.
- vis.flat_map_item(item).expect_one("expected visitor to produce exactly one item")
-}),
  token::NtBlock(block) => vis.visit_block(block),
- token::NtStmt(stmt) => visit_clobber(stmt, |stmt| {
-// See reasoning above.
- stmt.map(|stmt| {
- vis.flat_map_stmt(stmt).expect_one("expected visitor to produce exactly one item")
-})
-}),
  token::NtExpr(expr) => vis.visit_expr(expr),
  token::NtLiteral(expr) => vis.visit_expr(expr),
 }

compiler/rustc_ast/src/token.rs

@@ -870,6 +870,7 @@ impl Token {
 /// Is this a pre-parsed expression dropped into the token stream
 /// (which happens while parsing the result of macro expansion)?
 pubfnis_whole_expr(&self) -> bool{
+#[allow(irrefutable_let_patterns)]// FIXME: temporary
 ifletInterpolated(nt) = &self.kind
  && letNtExpr(_) | NtLiteral(_) | NtBlock(_) = &**nt
 {
@@ -1103,9 +1104,7 @@ pub enum NtExprKind {
 #[derive(Clone,Encodable,Decodable)]
 /// For interpolation during macro expansion.
 pubenumNonterminal{
-NtItem(P<ast::Item>),
 NtBlock(P<ast::Block>),
-NtStmt(P<ast::Stmt>),
 NtExpr(P<ast::Expr>),
 NtLiteral(P<ast::Expr>),
 }
@@ -1196,18 +1195,14 @@ impl fmt::Display for NonterminalKind {
 implNonterminal{
 pubfnuse_span(&self) -> Span{
 matchself{
-NtItem(item) => item.span,
 NtBlock(block) => block.span,
-NtStmt(stmt) => stmt.span,
 NtExpr(expr) | NtLiteral(expr) => expr.span,
 }
 }
 
 pubfndescr(&self) -> &'staticstr{
 matchself{
-NtItem(..) => "item",
 NtBlock(..) => "block",
-NtStmt(..) => "statement",
 NtExpr(..) => "expression",
 NtLiteral(..) => "literal",
 }
@@ -1227,9 +1222,7 @@ impl PartialEq for Nonterminal {
 impl fmt::DebugforNonterminal{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 match*self{
-NtItem(..) => f.pad("NtItem(..)"),
 NtBlock(..) => f.pad("NtBlock(..)"),
-NtStmt(..) => f.pad("NtStmt(..)"),
 NtExpr(..) => f.pad("NtExpr(..)"),
 NtLiteral(..) => f.pad("NtLiteral(..)"),
 }

compiler/rustc_ast/src/tokenstream.rs

@@ -23,7 +23,7 @@ use rustc_macros::{Decodable, Encodable, HashStable_Generic};
 use rustc_serialize::{Decodable,Encodable};
 use rustc_span::{DUMMY_SP,Span,SpanDecoder,SpanEncoder,Symbol, sym};
 
-usecrate::ast::{AttrStyle,StmtKind};
+usecrate::ast::AttrStyle;
 usecrate::ast_traits::{HasAttrs,HasTokens};
 usecrate::token::{self,Delimiter,InvisibleOrigin,Nonterminal,Token,TokenKind};
 usecrate::{AttrVec,Attribute};
@@ -461,13 +461,7 @@ impl TokenStream {
 
 pubfnfrom_nonterminal_ast(nt:&Nonterminal) -> TokenStream{
 match nt {
-Nonterminal::NtItem(item) => TokenStream::from_ast(item),
 Nonterminal::NtBlock(block) => TokenStream::from_ast(block),
-Nonterminal::NtStmt(stmt)ifletStmtKind::Empty = stmt.kind => {
-// FIXME: Properly collect tokens for empty statements.
-TokenStream::token_alone(token::Semi, stmt.span)
-}
-Nonterminal::NtStmt(stmt) => TokenStream::from_ast(stmt),
 Nonterminal::NtExpr(expr) | Nonterminal::NtLiteral(expr) => TokenStream::from_ast(expr),
 }
 }

compiler/rustc_ast_lowering/src/lib.rs

@@ -32,6 +32,7 @@
 
 // tidy-alphabetical-start
 #![allow(internal_features)]
+#![cfg_attr(doc, recursion_limit = "256")]// FIXME(nnethercote): will be removed by #124141
 #![doc(rust_logo)]
 #![feature(assert_matches)]
 #![feature(box_patterns)]

compiler/rustc_attr_parsing/src/lib.rs

@@ -77,6 +77,7 @@
 
 // tidy-alphabetical-start
 #![allow(internal_features)]
+#![cfg_attr(doc, recursion_limit = "256")]// FIXME(nnethercote): will be removed by #124141
 #![doc(rust_logo)]
 #![feature(let_chains)]
 #![feature(rustdoc_internals)]

compiler/rustc_borrowck/src/lib.rs

@@ -2,6 +2,7 @@
 
 // tidy-alphabetical-start
 #![allow(internal_features)]
+#![cfg_attr(doc, recursion_limit = "256")]// FIXME(nnethercote): will be removed by #124141
 #![doc(rust_logo)]
 #![feature(assert_matches)]
 #![feature(box_patterns)]

compiler/rustc_builtin_macros/src/cfg_eval.rs

@@ -140,8 +140,9 @@ impl CfgEval<'_> {
 Annotatable::ForeignItem(self.flat_map_foreign_item(item).pop().unwrap())
 }
 Annotatable::Stmt(_) => {
-let stmt =
- parser.parse_stmt_without_recovery(false,ForceCollect::Yes)?.unwrap();
+let stmt = parser
+.parse_stmt_without_recovery(false,ForceCollect::Yes,false)?
+.unwrap();
 Annotatable::Stmt(P(self.flat_map_stmt(stmt).pop().unwrap()))
 }
 Annotatable::Expr(_) => {

compiler/rustc_builtin_macros/src/lib.rs

@@ -5,6 +5,7 @@
 #![allow(internal_features)]
 #![allow(rustc::diagnostic_outside_of_impl)]
 #![allow(rustc::untranslatable_diagnostic)]
+#![cfg_attr(doc, recursion_limit = "256")]// FIXME(nnethercote): will be removed by #124141
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 #![doc(rust_logo)]
 #![feature(assert_matches)]