about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCamille GILLOT <gillot.camille@gmail.com>2019-11-09 22:02:24 +0100
committerCamille GILLOT <gillot.camille@gmail.com>2019-11-17 22:37:10 +0100
commit2a67986eb6970f5ec1d4df8e409f04397568935b (patch)
treeb2b08f17f45a86c1e8a39a55f6b1b819d6e6c7dd
parentefcb695f4c38f653d8f0adb70f94aa29328be679 (diff)
downloadrust-2a67986eb6970f5ec1d4df8e409f04397568935b.tar.gz
rust-2a67986eb6970f5ec1d4df8e409f04397568935b.zip
HashStable literals in libsyntax.
-rw-r--r--src/librustc/ich/impls_syntax.rs19
-rw-r--r--src/libsyntax/token.rs4
2 files changed, 2 insertions, 21 deletions
diff --git a/src/librustc/ich/impls_syntax.rs b/src/librustc/ich/impls_syntax.rs
index bf716dbf061..d86fd0f1dc3 100644
--- a/src/librustc/ich/impls_syntax.rs
+++ b/src/librustc/ich/impls_syntax.rs
@@ -137,25 +137,6 @@ for tokenstream::TokenStream {
     }
 }
 
-impl_stable_hash_for!(enum token::LitKind {
-    Bool,
-    Byte,
-    Char,
-    Integer,
-    Float,
-    Str,
-    ByteStr,
-    StrRaw(n),
-    ByteStrRaw(n),
-    Err
-});
-
-impl_stable_hash_for!(struct token::Lit {
-    kind,
-    symbol,
-    suffix
-});
-
 impl<'a> HashStable<StableHashingContext<'a>> for token::TokenKind {
     fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
         mem::discriminant(self).hash_stable(hcx, hasher);
diff --git a/src/libsyntax/token.rs b/src/libsyntax/token.rs
index ab798e93d67..8099b55780c 100644
--- a/src/libsyntax/token.rs
+++ b/src/libsyntax/token.rs
@@ -53,7 +53,7 @@ impl DelimToken {
     }
 }
 
-#[derive(Clone, Copy, PartialEq, RustcEncodable, RustcDecodable, Debug)]
+#[derive(Clone, Copy, PartialEq, RustcEncodable, RustcDecodable, Debug, HashStable_Generic)]
 pub enum LitKind {
     Bool, // AST only, must never appear in a `Token`
     Byte,
@@ -68,7 +68,7 @@ pub enum LitKind {
 }
 
 /// A literal token.
-#[derive(Clone, Copy, PartialEq, RustcEncodable, RustcDecodable, Debug)]
+#[derive(Clone, Copy, PartialEq, RustcEncodable, RustcDecodable, Debug, HashStable_Generic)]
 pub struct Lit {
     pub kind: LitKind,
     pub symbol: Symbol,