Skip to content

Commit 5b62b3d

Browse files
committed
---
yaml --- r: 187259 b: refs/heads/try c: 5d8c9f5 h: refs/heads/master i: 187257: d777a46 187255: bedd208 v: v3
1 parent 7c76ecb commit 5b62b3d

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: b4c965ee803a4521d8b4575f634e036f93e408f3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
5-
refs/heads/try: 67b03fbc3d44c88df160ba4ba6922b01f4c7675e
5+
refs/heads/try: 5d8c9f5c9976a906c8d2b41f9375df2f735ec23b
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/libcore/hash/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
//!
2121
//! #[derive(Hash)]
2222
//! struct Person {
23-
//! id: uint,
23+
//! id: u32,
2424
//! name: String,
2525
//! phone: u64,
2626
//! }
@@ -38,7 +38,7 @@
3838
//! use std::hash::{hash, Hash, Hasher, SipHasher};
3939
//!
4040
//! struct Person {
41-
//! id: uint,
41+
//! id: u32,
4242
//! name: String,
4343
//! phone: u64,
4444
//! }

branches/try/src/libcore/hash/sip.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ use super::Hasher;
3434
pub struct SipHasher {
3535
k0: u64,
3636
k1: u64,
37-
length: uint, // how many bytes we've processed
37+
length: usize, // how many bytes we've processed
3838
v0: u64, // hash state
3939
v1: u64,
4040
v2: u64,
4141
v3: u64,
4242
tail: u64, // unprocessed bytes le
43-
ntail: uint, // how many bytes in tail are valid
43+
ntail: usize, // how many bytes in tail are valid
4444
}
4545

4646
// sadly, these macro definitions can't appear later,

0 commit comments

Comments
 (0)