about summary refs log tree commit diff
path: root/src/libstd/collections
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-03-04 22:03:15 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-03-05 12:38:33 +0530
commit145b83e63355c672f8e43129f8e7833fac35dce2 (patch)
tree041ed4dd28872ac22473460cdfc8ca8b7ef260aa /src/libstd/collections
parentc8c4d85b5014a947f57acd9a1e14b7864689f73d (diff)
parent34410ec748b92e15c445ba7371561e2e5c5aaa55 (diff)
downloadrust-145b83e63355c672f8e43129f8e7833fac35dce2.tar.gz
rust-145b83e63355c672f8e43129f8e7833fac35dce2.zip
Rollup merge of #22994 - eddyb:unsuffix-ints-good, r=alexcrichton
 Automatic has-same-types testing methodology can be found in #22501.
Because most of them don't work with `--pretty=typed`, compile-fail tests were manually audited.

r? @aturon
Diffstat (limited to 'src/libstd/collections')
-rw-r--r--src/libstd/collections/hash/table.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs
index 2670cd0c003..69fd0a57d5f 100644
--- a/src/libstd/collections/hash/table.rs
+++ b/src/libstd/collections/hash/table.rs
@@ -28,7 +28,7 @@ use ptr::{self, PtrExt, Unique};
 use rt::heap::{allocate, deallocate, EMPTY};
 use collections::hash_state::HashState;
 
-const EMPTY_BUCKET: u64 = 0u64;
+const EMPTY_BUCKET: u64 = 0;
 
 /// The raw hashtable, providing safe-ish access to the unzipped and highly
 /// optimized arrays of hashes, keys, and values.
@@ -149,7 +149,7 @@ pub fn make_hash<T: ?Sized, S>(hash_state: &S, t: &T) -> SafeHash
 {
     let mut state = hash_state.hasher();
     t.hash(&mut state);
-    // We need to avoid 0u64 in order to prevent collisions with
+    // We need to avoid 0 in order to prevent collisions with
     // EMPTY_HASH. We can maintain our precious uniform distribution
     // of initial indexes by unconditionally setting the MSB,
     // effectively reducing 64-bits hashes to 63 bits.