about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicholas Nethercote <n.nethercote@gmail.com>2022-04-13 16:18:01 +1000
committerNicholas Nethercote <n.nethercote@gmail.com>2022-04-19 17:02:48 +1000
commitaefbbeec34e82ed6ccfbb94d8689c134cd8ae9a9 (patch)
treea1008764892bef5676b13eea5e04391e40e18a46
parentad566b78f21d58c2a25feeba06fc9506fe514b46 (diff)
downloadrust-aefbbeec34e82ed6ccfbb94d8689c134cd8ae9a9.tar.gz
rust-aefbbeec34e82ed6ccfbb94d8689c134cd8ae9a9.zip
Inline and remove `TokenTree::{open_tt,close_tt}`.
They both have a single call site.
-rw-r--r--compiler/rustc_ast/src/tokenstream.rs10
-rw-r--r--compiler/rustc_parse/src/parser/mod.rs4
2 files changed, 2 insertions, 12 deletions
diff --git a/compiler/rustc_ast/src/tokenstream.rs b/compiler/rustc_ast/src/tokenstream.rs
index a4057043e48..857dc307c98 100644
--- a/compiler/rustc_ast/src/tokenstream.rs
+++ b/compiler/rustc_ast/src/tokenstream.rs
@@ -94,16 +94,6 @@ impl TokenTree {
         TokenTree::Token(Token::new(kind, span))
     }
 
-    /// Returns the opening delimiter as a token tree.
-    pub fn open_tt(span: DelimSpan, delim: DelimToken) -> TokenTree {
-        TokenTree::token(token::OpenDelim(delim), span.open)
-    }
-
-    /// Returns the closing delimiter as a token tree.
-    pub fn close_tt(span: DelimSpan, delim: DelimToken) -> TokenTree {
-        TokenTree::token(token::CloseDelim(delim), span.close)
-    }
-
     pub fn uninterpolate(self) -> TokenTree {
         match self {
             TokenTree::Token(token) => TokenTree::Token(token.uninterpolate().into_owned()),
diff --git a/compiler/rustc_parse/src/parser/mod.rs b/compiler/rustc_parse/src/parser/mod.rs
index cb6be8f412c..ad6a7b90bc9 100644
--- a/compiler/rustc_parse/src/parser/mod.rs
+++ b/compiler/rustc_parse/src/parser/mod.rs
@@ -266,12 +266,12 @@ impl TokenCursor {
         loop {
             let (tree, spacing) = if !self.frame.open_delim {
                 self.frame.open_delim = true;
-                TokenTree::open_tt(self.frame.span, self.frame.delim).into()
+                TokenTree::token(token::OpenDelim(self.frame.delim), self.frame.span.open).into()
             } else if let Some(tree) = self.frame.tree_cursor.next_with_spacing() {
                 tree
             } else if !self.frame.close_delim {
                 self.frame.close_delim = true;
-                TokenTree::close_tt(self.frame.span, self.frame.delim).into()
+                TokenTree::token(token::CloseDelim(self.frame.delim), self.frame.span.close).into()
             } else if let Some(frame) = self.stack.pop() {
                 self.frame = frame;
                 continue;