Auto merge of #69156 - ecstatic-morse:unified-dataflow-impls2, r=eddyb

[rust.git] / src / librustc_data_structures / fingerprint.rs

diff --git a/src/librustc_data_structures/fingerprint.rs b/src/librustc_data_structures/fingerprint.rs
index c8012bb9424615bd0974fd9a35b8e7097958d8e8..282626611d50bd92bd0f2d08928ee97410330f2b 100644 (file)
--- a/src/librustc_data_structures/fingerprint.rs
+++ b/src/librustc_data_structures/fingerprint.rs
@@ -1,12 +1,11 @@
 use crate::stable_hasher;
+use rustc_serialize::opaque::{Decoder, EncodeResult, Encoder};
 use std::mem;
-use rustc_serialize::opaque::{EncodeResult, Encoder, Decoder};
 
 #[derive(Eq, PartialEq, Ord, PartialOrd, Hash, Debug, Clone, Copy)]
 pub struct Fingerprint(u64, u64);
 
 impl Fingerprint {
-
     pub const ZERO: Fingerprint = Fingerprint(0, 0);
 
     #[inline]
@@ -30,7 +29,7 @@ pub fn combine(self, other: Fingerprint) -> Fingerprint {
         // implemented this way.
         Fingerprint(
             self.0.wrapping_mul(3).wrapping_add(other.0),
-            self.1.wrapping_mul(3).wrapping_add(other.1)
+            self.1.wrapping_mul(3).wrapping_add(other.1),
         )
     }
 
@@ -76,7 +75,7 @@ fn fmt(&self, formatter: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
 
 impl stable_hasher::StableHasherResult for Fingerprint {
     #[inline]
-    fn finish(hasher: stable_hasher::StableHasher<Self>) -> Self {
+    fn finish(hasher: stable_hasher::StableHasher) -> Self {
         let (_0, _1) = hasher.finalize();
         Fingerprint(_0, _1)
     }
@@ -84,9 +83,9 @@ fn finish(hasher: stable_hasher::StableHasher<Self>) -> Self {
 
 impl_stable_hash_via_hash!(Fingerprint);
 
-impl rustc_serialize::UseSpecializedEncodable for Fingerprint { }
+impl rustc_serialize::UseSpecializedEncodable for Fingerprint {}
 
-impl rustc_serialize::UseSpecializedDecodable for Fingerprint { }
+impl rustc_serialize::UseSpecializedDecodable for Fingerprint {}
 
 impl rustc_serialize::SpecializedEncoder<Fingerprint> for Encoder {
     fn specialized_encode(&mut self, f: &Fingerprint) -> Result<(), Self::Error> {