Skip to content

Commit 16781e7

Browse files
committed
Update test suite to nightly-2021-03-30
rust-lang/rust#83185
1 parent eede299 commit 16781e7

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

tests/common/eq.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -478,8 +478,8 @@ impl SpanlessEq for TokenKind {
478478

479479
impl SpanlessEq for TokenStream {
480480
fn eq(&self, other: &Self) -> bool {
481-
let mut this_trees = self.trees_ref();
482-
let mut other_trees = other.trees_ref();
481+
let mut this_trees = self.trees();
482+
let mut other_trees = other.trees();
483483
loop {
484484
let this = match this_trees.next() {
485485
None => return other_trees.next().is_none(),
@@ -489,7 +489,7 @@ impl SpanlessEq for TokenStream {
489489
None => return false,
490490
Some(tree) => tree,
491491
};
492-
if SpanlessEq::eq(this, other) {
492+
if SpanlessEq::eq(&this, &other) {
493493
continue;
494494
}
495495
if let (TokenTree::Token(this), TokenTree::Token(other)) = (this, other) {
@@ -516,7 +516,7 @@ impl SpanlessEq for TokenStream {
516516
fn doc_comment<'a>(
517517
style: AttrStyle,
518518
unescaped: Symbol,
519-
trees: &mut impl Iterator<Item = &'a TokenTree>,
519+
trees: &mut impl Iterator<Item = TokenTree>,
520520
) -> bool {
521521
if match style {
522522
AttrStyle::Outer => false,
@@ -534,12 +534,12 @@ fn doc_comment<'a>(
534534
Some(TokenTree::Delimited(_span, DelimToken::Bracket, stream)) => stream,
535535
_ => return false,
536536
};
537-
let mut trees = stream.trees_ref();
537+
let mut trees = stream.trees();
538538
match trees.next() {
539539
Some(TokenTree::Token(Token {
540540
kind: TokenKind::Ident(symbol, false),
541541
span: _,
542-
})) if *symbol == sym::doc => {}
542+
})) if symbol == sym::doc => {}
543543
_ => return false,
544544
}
545545
match trees.next() {
@@ -551,7 +551,7 @@ fn doc_comment<'a>(
551551
}
552552
match trees.next() {
553553
Some(TokenTree::Token(token)) => {
554-
is_escaped_literal(token, unescaped) && trees.next().is_none()
554+
is_escaped_literal(&token, unescaped) && trees.next().is_none()
555555
}
556556
_ => false,
557557
}

0 commit comments

Comments
 (0)