Skip to content

Commit 56aacb2

Browse files
StableOrd: Address review comments.
1 parent 3a58309 commit 56aacb2

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

compiler/rustc_data_structures/src/fingerprint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ impl stable_hasher::StableHasherResult for Fingerprint {
140140
}
141141
}
142142

143-
impl_stable_ord_and_stable_hash_via_hash!(Fingerprint);
143+
impl_stable_traits_for_trivial_type!(Fingerprint);
144144

145145
impl<E: Encoder> Encodable<E> for Fingerprint {
146146
#[inline]

compiler/rustc_data_structures/src/stable_hasher.rs

+18-18
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ pub unsafe trait StableOrd: Ord {}
255255
/// here in this module.
256256
///
257257
/// Use `#[derive(HashStable_Generic)]` instead.
258-
macro_rules! impl_stable_ord_and_stable_hash_via_hash {
258+
macro_rules! impl_stable_traits_for_trivial_type {
259259
($t:ty) => {
260260
impl<CTX> $crate::stable_hasher::HashStable<CTX> for $t {
261261
#[inline]
@@ -268,23 +268,23 @@ macro_rules! impl_stable_ord_and_stable_hash_via_hash {
268268
};
269269
}
270270

271-
impl_stable_ord_and_stable_hash_via_hash!(i8);
272-
impl_stable_ord_and_stable_hash_via_hash!(i16);
273-
impl_stable_ord_and_stable_hash_via_hash!(i32);
274-
impl_stable_ord_and_stable_hash_via_hash!(i64);
275-
impl_stable_ord_and_stable_hash_via_hash!(isize);
271+
impl_stable_traits_for_trivial_type!(i8);
272+
impl_stable_traits_for_trivial_type!(i16);
273+
impl_stable_traits_for_trivial_type!(i32);
274+
impl_stable_traits_for_trivial_type!(i64);
275+
impl_stable_traits_for_trivial_type!(isize);
276276

277-
impl_stable_ord_and_stable_hash_via_hash!(u8);
278-
impl_stable_ord_and_stable_hash_via_hash!(u16);
279-
impl_stable_ord_and_stable_hash_via_hash!(u32);
280-
impl_stable_ord_and_stable_hash_via_hash!(u64);
281-
impl_stable_ord_and_stable_hash_via_hash!(usize);
277+
impl_stable_traits_for_trivial_type!(u8);
278+
impl_stable_traits_for_trivial_type!(u16);
279+
impl_stable_traits_for_trivial_type!(u32);
280+
impl_stable_traits_for_trivial_type!(u64);
281+
impl_stable_traits_for_trivial_type!(usize);
282282

283-
impl_stable_ord_and_stable_hash_via_hash!(u128);
284-
impl_stable_ord_and_stable_hash_via_hash!(i128);
283+
impl_stable_traits_for_trivial_type!(u128);
284+
impl_stable_traits_for_trivial_type!(i128);
285285

286-
impl_stable_ord_and_stable_hash_via_hash!(char);
287-
impl_stable_ord_and_stable_hash_via_hash!(());
286+
impl_stable_traits_for_trivial_type!(char);
287+
impl_stable_traits_for_trivial_type!(());
288288

289289
impl<CTX> HashStable<CTX> for ! {
290290
fn hash_stable(&self, _ctx: &mut CTX, _hasher: &mut StableHasher) {
@@ -590,8 +590,8 @@ where
590590
}
591591
}
592592

593-
impl_stable_ord_and_stable_hash_via_hash!(::std::path::Path);
594-
impl_stable_ord_and_stable_hash_via_hash!(::std::path::PathBuf);
593+
impl_stable_traits_for_trivial_type!(::std::path::Path);
594+
impl_stable_traits_for_trivial_type!(::std::path::PathBuf);
595595

596596
impl<K, V, R, HCX> HashStable<HCX> for ::std::collections::HashMap<K, V, R>
597597
where
@@ -635,7 +635,7 @@ where
635635
}
636636
}
637637

638-
impl<K: StableOrd, HCX> HashStable<HCX> for ::std::collections::BTreeSet<K>
638+
impl<K, HCX> HashStable<HCX> for ::std::collections::BTreeSet<K>
639639
where
640640
K: HashStable<HCX> + StableOrd,
641641
{

0 commit comments

Comments
 (0)