Skip to content

Commit 550d36d

Browse files
authored
Rollup merge of #134161 - nnethercote:overhaul-token-cursors, r=spastorino
Overhaul token cursors Some nice cleanups here. r? `````@davidtwco`````
2 parents 4d05825 + 1cb4dca commit 550d36d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

clippy_lints/src/attrs/should_panic_without_expect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub(super) fn check(cx: &EarlyContext<'_>, attr: &Attribute) {
1515
}
1616

1717
if let AttrArgs::Delimited(args) = &normal_attr.item.args
18-
&& let mut tt_iter = args.tokens.trees()
18+
&& let mut tt_iter = args.tokens.iter()
1919
&& let Some(TokenTree::Token(
2020
Token {
2121
kind: TokenKind::Ident(sym::expected, _),

clippy_lints/src/crate_in_macro_def.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ fn is_macro_export(attr: &Attribute) -> bool {
8282

8383
fn contains_unhygienic_crate_reference(tts: &TokenStream) -> Option<Span> {
8484
let mut prev_is_dollar = false;
85-
let mut cursor = tts.trees();
86-
while let Some(curr) = cursor.next() {
85+
let mut iter = tts.iter();
86+
while let Some(curr) = iter.next() {
8787
if !prev_is_dollar
8888
&& let Some(span) = is_crate_keyword(curr)
89-
&& let Some(next) = cursor.look_ahead(0)
89+
&& let Some(next) = iter.peek()
9090
&& is_token(next, &TokenKind::PathSep)
9191
{
9292
return Some(span);

0 commit comments

Comments
 (0)