diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-18 14:39:37 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-18 15:27:42 -0800 |
| commit | 365bd9a9e3b9dafa98e26982353fd28a6ca1efef (patch) | |
| tree | a4d25ce7c59172f76f94d27077389854c55f8bfe /src/libcoretest | |
| parent | b64dfff326a0e248227c5782eccce7ca8b02f66c (diff) | |
| download | rust-365bd9a9e3b9dafa98e26982353fd28a6ca1efef.tar.gz rust-365bd9a9e3b9dafa98e26982353fd28a6ca1efef.zip | |
Round 1 fixes and rebase conflicts
Diffstat (limited to 'src/libcoretest')
| -rw-r--r-- | src/libcoretest/hash/mod.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libcoretest/hash/mod.rs b/src/libcoretest/hash/mod.rs index 2d85769c0cd..9b6af182f72 100644 --- a/src/libcoretest/hash/mod.rs +++ b/src/libcoretest/hash/mod.rs @@ -23,7 +23,6 @@ impl Default for MyHasher { } impl Hasher for MyHasher { - type Output = u64; fn write(&mut self, buf: &[u8]) { for byte in buf { self.hash += *byte as u64; @@ -85,7 +84,6 @@ struct Custom { hash: u64 } struct CustomHasher { output: u64 } impl Hasher for CustomHasher { - type Output = u64; fn finish(&self) -> u64 { self.output } fn write(&mut self, data: &[u8]) { panic!() } fn write_u64(&mut self, data: u64) { self.output = data; } |