about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorCamille GILLOT <gillot.camille@gmail.com>2019-11-23 13:58:17 +0100
committerCamille GILLOT <gillot.camille@gmail.com>2019-11-23 17:57:00 +0100
commitce301075c0de3b69914cc11744558dabd6d2e731 (patch)
treebb25cdd797d5e2bdda2cc4ef9153da3dd2080bf1 /src/libsyntax
parent9efd3205b57aaa8908a1eca337ab8336cdb16bc2 (diff)
Rename StableHashingContextLike to HashStableContext.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/lib.rs2
-rw-r--r--src/libsyntax/token.rs2
-rw-r--r--src/libsyntax/tokenstream.rs4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 939e1877b4a..579d2657939 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -115,6 +115,6 @@ pub mod early_buffered_lints;
 /// Requirements for a `StableHashingContext` to be used in this crate.
 /// This is a hack to allow using the `HashStable_Generic` derive macro
 /// instead of implementing everything in librustc.
-pub trait StableHashingContextLike: syntax_pos::StableHashingContextLike {
+pub trait HashStableContext: syntax_pos::HashStableContext {
     fn hash_stable_tokenkind(&mut self, tokenkind: &token::TokenKind, hasher: &mut StableHasher);
 }
diff --git a/src/libsyntax/token.rs b/src/libsyntax/token.rs
index 305db739399..08afca921fc 100644
--- a/src/libsyntax/token.rs
+++ b/src/libsyntax/token.rs
@@ -264,7 +264,7 @@ pub enum TokenKind {
 rustc_data_structures::static_assert_size!(TokenKind, 16);
 
 impl<CTX> HashStable<CTX> for TokenKind
-    where CTX: crate::StableHashingContextLike
+    where CTX: crate::HashStableContext
 {
     fn hash_stable(&self, hcx: &mut CTX, hasher: &mut StableHasher) {
         hcx.hash_stable_tokenkind(self, hasher)
diff --git a/src/libsyntax/tokenstream.rs b/src/libsyntax/tokenstream.rs
index eb99e549a7f..5ec99fa2f08 100644
--- a/src/libsyntax/tokenstream.rs
+++ b/src/libsyntax/tokenstream.rs
@@ -54,7 +54,7 @@ where
 {}
 
 impl<CTX> HashStable<CTX> for TokenTree
-    where CTX: crate::StableHashingContextLike
+    where CTX: crate::HashStableContext
 {
     fn hash_stable(&self, hcx: &mut CTX, hasher: &mut StableHasher) {
         mem::discriminant(self).hash_stable(hcx, hasher);
@@ -138,7 +138,7 @@ impl TokenTree {
 }
 
 impl<CTX> HashStable<CTX> for TokenStream
-    where CTX: crate::StableHashingContextLike
+    where CTX: crate::HashStableContext
 {
     fn hash_stable(&self, hcx: &mut CTX, hasher: &mut StableHasher) {
         for sub_tt in self.trees() {