Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f836ae4

Browse files
committedApr 14, 2025·
Auto merge of rust-lang#124141 - nnethercote:rm-Nonterminal-and-TokenKind-Interpolated, r=petrochenkov
Remove `Nonterminal` and `TokenKind::Interpolated` A third attempt at this; the first attempt was rust-lang#96724 and the second was rust-lang#114647. r? `@ghost`
2 parents 15f58c4 + 1830245 commit f836ae4

File tree

61 files changed

+164
-532
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+164
-532
lines changed
 

‎compiler/rustc_ast/src/ast_traits.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use std::fmt;
66
use std::marker::PhantomData;
77

88
use crate::ptr::P;
9-
use crate::token::Nonterminal;
109
use crate::tokenstream::LazyAttrTokenStream;
1110
use crate::{
1211
Arm, AssocItem, AttrItem, AttrKind, AttrVec, Attribute, Block, Crate, Expr, ExprField,
@@ -206,19 +205,6 @@ impl HasTokens for Attribute {
206205
}
207206
}
208207

209-
impl HasTokens for Nonterminal {
210-
fn tokens(&self) -> Option<&LazyAttrTokenStream> {
211-
match self {
212-
Nonterminal::NtBlock(block) => block.tokens(),
213-
}
214-
}
215-
fn tokens_mut(&mut self) -> Option<&mut Option<LazyAttrTokenStream>> {
216-
match self {
217-
Nonterminal::NtBlock(block) => block.tokens_mut(),
218-
}
219-
}
220-
}
221-
222208
/// A trait for AST nodes having (or not having) attributes.
223209
pub trait HasAttrs {
224210
/// This is `true` if this `HasAttrs` might support 'custom' (proc-macro) inner

‎compiler/rustc_ast/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
77
// tidy-alphabetical-start
88
#![allow(internal_features)]
9-
#![cfg_attr(doc, recursion_limit = "256")] // FIXME(nnethercote): will be removed by #124141
109
#![doc(
1110
html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/",
1211
test(attr(deny(warnings)))

0 commit comments

Comments
 (0)
This repository has been archived.