Rename StableHashingContextLike to HashStableContext.

Author: cjgillot

src/librustc/ich/hcx.rs

@@ -280,7 +280,7 @@ impl<'a> ToStableHashKey<StableHashingContext<'a>> for ast::NodeId {
     }
 }
 
-impl<'a> syntax_pos::StableHashingContextLike for StableHashingContext<'a> {
+impl<'a> syntax_pos::HashStableContext for StableHashingContext<'a> {
     /// Hashes a span in a stable way. We can't directly hash the span's `BytePos`
     /// fields (that would be similar to hashing pointers, since those are just
     /// offsets into the `SourceMap`). Instead, we hash the (file name, line, column)

src/librustc/ich/impls_syntax.rs

@@ -16,7 +16,7 @@ use crate::hir::def_id::{DefId, CrateNum, CRATE_DEF_INDEX};
 use smallvec::SmallVec;
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 
-impl<'ctx> rustc_target::StableHashingContextLike for StableHashingContext<'ctx> {}
+impl<'ctx> rustc_target::HashStableContext for StableHashingContext<'ctx> {}
 
 impl<'a> HashStable<StableHashingContext<'a>> for ast::Lifetime {
     fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHasher) {
@@ -65,7 +65,7 @@ impl<'a> HashStable<StableHashingContext<'a>> for ast::Attribute {
     }
 }
 
-impl<'ctx> syntax::StableHashingContextLike for StableHashingContext<'ctx> {
+impl<'ctx> syntax::HashStableContext for StableHashingContext<'ctx> {
     fn hash_stable_tokenkind(&mut self, tokenkind: &token::TokenKind, hasher: &mut StableHasher) {
         mem::discriminant(tokenkind).hash_stable(self, hasher);
         match *tokenkind {

src/librustc_macros/src/hash_stable.rs

@@ -51,7 +51,7 @@ pub fn hash_stable_generic_derive(mut s: synstructure::Structure<'_>) -> proc_ma
     let generic: syn::GenericParam = parse_quote!(__CTX);
     s.add_bounds(synstructure::AddBounds::Generics);
     s.add_impl_generic(generic);
-    s.add_where_predicate(parse_quote!{ __CTX: crate::StableHashingContextLike });
+    s.add_where_predicate(parse_quote!{ __CTX: crate::HashStableContext });
     let body = s.each(|bi| {
         let attrs = parse_attributes(bi.ast());
         if attrs.ignore {

src/librustc_target/lib.rs

@@ -21,4 +21,4 @@ pub mod spec;
 /// 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 {}
+pub trait HashStableContext {}

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);
 }

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)

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() {

src/libsyntax_pos/lib.rs

@@ -246,7 +246,7 @@ impl Ord for Span {
 }
 
 impl<CTX> HashStable<CTX> for Span
-    where CTX: StableHashingContextLike
+    where CTX: HashStableContext
 {
     fn hash_stable(&self, ctx: &mut CTX, hasher: &mut StableHasher) {
         ctx.hash_stable_span(self, hasher)
@@ -1574,6 +1574,6 @@ fn lookup_line(lines: &[BytePos], pos: BytePos) -> isize {
 /// 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 {
+pub trait HashStableContext {
     fn hash_stable_span(&mut self, span: &Span, hasher: &mut StableHasher);
 }