Skip to content

refactor: push_lifetime* goes through an array instead of a manual iterator #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dtolnay merged 2 commits into from
Mar 11, 2025
+12 −58
Merged

refactor: push_lifetime* goes through an array instead of a manual iterator #293

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5998437
refactor: push_lifetime* goes through an array instead of a manual it…
aatifsyed Mar 11, 2025
7a143c7
fix: set span on tick
aatifsyed Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 12 additions & 58 deletions src/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,68 +305,22 @@ pub fn push_ident_spanned(tokens: &mut TokenStream, span: Span, s: &str) {

#[doc(hidden)]
pub fn push_lifetime(tokens: &mut TokenStream, lifetime: &str) {
struct Lifetime<'a> {
name: &'a str,
state: u8,
}

impl<'a> Iterator for Lifetime<'a> {
type Item = TokenTree;

fn next(&mut self) -> Option<Self::Item> {
match self.state {
0 => {
self.state = 1;
Some(TokenTree::Punct(Punct::new('\'', Spacing::Joint)))
}
1 => {
self.state = 2;
Some(TokenTree::Ident(Ident::new(self.name, Span::call_site())))
}
_ => None,
}
}
}

tokens.extend(Lifetime {
name: &lifetime[1..],
state: 0,
});
tokens.extend([
TokenTree::Punct(Punct::new('\'', Spacing::Joint)),
TokenTree::Ident(Ident::new(&lifetime[1..], Span::call_site())),
]);
}

#[doc(hidden)]
pub fn push_lifetime_spanned(tokens: &mut TokenStream, span: Span, lifetime: &str) {
struct Lifetime<'a> {
name: &'a str,
span: Span,
state: u8,
}

impl<'a> Iterator for Lifetime<'a> {
type Item = TokenTree;

fn next(&mut self) -> Option<Self::Item> {
match self.state {
0 => {
self.state = 1;
let mut apostrophe = Punct::new('\'', Spacing::Joint);
apostrophe.set_span(self.span);
Some(TokenTree::Punct(apostrophe))
}
1 => {
self.state = 2;
Some(TokenTree::Ident(Ident::new(self.name, self.span)))
}
_ => None,
}
}
}

tokens.extend(Lifetime {
name: &lifetime[1..],
span,
state: 0,
});
tokens.extend([
TokenTree::Punct({
let mut tick = Punct::new('\'', Spacing::Joint);
tick.set_span(span);
tick
}),
TokenTree::Ident(Ident::new(&lifetime[1..], span)),
]);
}

macro_rules! push_punct {
Expand Down