From cea7a1e039c028ca2a7c4766485b2b4fb1f60056 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 14 May 2024 19:24:05 -0700
Subject: [PATCH] Update test suite to nightly-2024-05-15

---
 tests/common/eq.rs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/tests/common/eq.rs b/tests/common/eq.rs
index e3a6b67df8..7d866171ab 100644
--- a/tests/common/eq.rs
+++ b/tests/common/eq.rs
@@ -684,15 +684,14 @@ impl SpanlessEq for TokenKind {
                 _ => false,
             },
             (TokenKind::Interpolated(this), TokenKind::Interpolated(other)) => {
-                let (this, this_span) = this.as_ref();
-                let (other, other_span) = other.as_ref();
-                SpanlessEq::eq(this_span, other_span)
-                    && match (this, other) {
-                        (Nonterminal::NtExpr(this), Nonterminal::NtExpr(other)) => {
-                            SpanlessEq::eq(this, other)
-                        }
-                        _ => this == other,
+                let this = this.as_ref();
+                let other = other.as_ref();
+                match (this, other) {
+                    (Nonterminal::NtExpr(this), Nonterminal::NtExpr(other)) => {
+                        SpanlessEq::eq(this, other)
                     }
+                    _ => this == other,
+                }
             }
             _ => self == other,
         }
@@ -801,7 +800,7 @@ fn is_escaped_literal_token(token: &Token, unescaped: Symbol) -> bool {
         Token {
             kind: TokenKind::Interpolated(nonterminal),
             span: _,
-        } => match &nonterminal.0 {
+        } => match nonterminal.as_ref() {
             Nonterminal::NtExpr(expr) => match &expr.kind {
                 ExprKind::Lit(lit) => is_escaped_lit(lit, unescaped),
                 _ => false,