Skip to content

Commit 21ec965

Browse files
committed
---
yaml --- r: 185793 b: refs/heads/auto c: 5d8c9f5 h: refs/heads/master i: 185791: 31753b2 v: v3
1 parent 957b909 commit 21ec965

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
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 67b03fbc3d44c88df160ba4ba6922b01f4c7675e
13+
refs/heads/auto: 5d8c9f5c9976a906c8d2b41f9375df2f735ec23b
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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/auto/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)