Rollup merge of #68424 - estebank:suggest-borrow-for-non-copy-vec, r=davidtwco

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

diff --git a/src/librustc_data_structures/thin_vec.rs b/src/librustc_data_structures/thin_vec.rs
index 6692903cd4fe9d31a0004ced8c80061cf6f2f0e6..2befc0aa50487bcffe722061c0dfe0cce226f5ca 100644 (file)
--- a/src/librustc_data_structures/thin_vec.rs
+++ b/src/librustc_data_structures/thin_vec.rs
@@ -1,9 +1,9 @@
-use crate::stable_hasher::{StableHasher, StableHasherResult, HashStable};
+use crate::stable_hasher::{HashStable, StableHasher};
 
 /// A vector type optimized for cases where this size is usually 0 (cf. `SmallVector`).
 /// The `Option<Box<..>>` wrapping allows us to represent a zero sized vector with `None`,
 /// which uses only a single (null) pointer.
-#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
+#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
 pub struct ThinVec<T>(Option<Box<Vec<T>>>);
 
 impl<T> ThinVec<T> {
@@ -14,11 +14,7 @@ pub fn new() -> Self {
 
 impl<T> From<Vec<T>> for ThinVec<T> {
     fn from(vec: Vec<T>) -> Self {
-        if vec.is_empty() {
-            ThinVec(None)
-        } else {
-            ThinVec(Some(Box::new(vec)))
-        }
+        if vec.is_empty() { ThinVec(None) } else { ThinVec(Some(Box::new(vec))) }
     }
 }
 
@@ -60,9 +56,7 @@ fn extend<I: IntoIterator<Item = T>>(&mut self, iter: I) {
 }
 
 impl<T: HashStable<CTX>, CTX> HashStable<CTX> for ThinVec<T> {
-    fn hash_stable<W: StableHasherResult>(&self,
-                                          hcx: &mut CTX,
-                                          hasher: &mut StableHasher<W>) {
+    fn hash_stable(&self, hcx: &mut CTX, hasher: &mut StableHasher) {
         (**self).hash_stable(hcx, hasher)
     }
 }