commit 2d99b00fcc2fedebe241394ecb83d66a71662432
author David Tolnay <dtolnay@gmail.com> Mon Dec 21 14:34:35 2020 -0800
committer David Tolnay <dtolnay@gmail.com> Mon Dec 21 14:34:35 2020 -0800
tree 8b70c0218a915d6d6b476d2e8b2b54fbbfba1605
parent fa5a4a6b5b1407aa608d7776a07f4ac1ae4fb170

Inline some niche RustName methods

syntax/check.rs

diff --git a/syntax/check.rs b/syntax/check.rs
index d0b0ba0..2ac800b 100644
--- a/syntax/check.rs
+++ b/syntax/check.rs
@@ -356,7 +356,7 @@
     if let Some(receiver) = &efn.receiver {
         let ref span = span_for_receiver_error(receiver);
 
-        if receiver.ty.is_self() {
+        if receiver.ty.rust == "Self" {
             let mutability = match receiver.mutable {
                 true => "mut ",
                 false => "",

syntax/names.rs

diff --git a/syntax/names.rs b/syntax/names.rs
index 2cc91f9..523850e 100644
--- a/syntax/names.rs
+++ b/syntax/names.rs
@@ -1,7 +1,6 @@
 use crate::syntax::{Namespace, Pair, RustName, Symbol, Types};
 use proc_macro2::{Ident, Span};
 use std::iter;
-use syn::Token;
 
 impl Pair {
     // Use this constructor when the item can't have a different name in Rust
@@ -57,16 +56,6 @@
         unsafe { &*(ident as *const Ident as *const Self) }
     }
 
-    pub fn make_self(span: Span) -> Self {
-        Self {
-            rust: Token![Self](span).into(),
-        }
-    }
-
-    pub fn is_self(&self) -> bool {
-        self.rust == "Self"
-    }
-
     pub fn span(&self) -> Span {
         self.rust.span()
     }

syntax/parse.rs

diff --git a/syntax/parse.rs b/syntax/parse.rs
index c571132..4b3e435 100644
--- a/syntax/parse.rs
+++ b/syntax/parse.rs
@@ -288,8 +288,8 @@
         for item in &mut items {
             if let Api::CxxFunction(efn) | Api::RustFunction(efn) = item {
                 if let Some(receiver) = &mut efn.receiver {
-                    if receiver.ty.is_self() {
-                        receiver.ty = RustName::new(single_type.rust.clone());
+                    if receiver.ty.rust == "Self" {
+                        receiver.ty.rust = single_type.rust.clone();
                     }
                 }
             }
@@ -432,7 +432,7 @@
                         lifetime: lifetime.clone(),
                         mutable: arg.mutability.is_some(),
                         var: arg.self_token,
-                        ty: RustName::make_self(arg.self_token.span),
+                        ty: RustName::new(Ident::new("Self", arg.self_token.span)),
                         shorthand: true,
                         pin_tokens: None,
                         mutability: arg.mutability,