Skip to content

Commit ac2ecdd

Browse files
committed
---
yaml --- r: 85898 b: refs/heads/dist-snap c: 78c5f97 h: refs/heads/master v: v3
1 parent f5082a0 commit ac2ecdd

File tree

6 files changed

+1
-14
lines changed

6 files changed

+1
-14
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: b8d1fa399402c71331aefd634d710004e00b73a6
9+
refs/heads/dist-snap: 78c5f97a09e7478181c9e4922dea0d4436a590c9
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/metadata/decoder.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ use middle::typeck;
2626
use middle::astencode::vtable_decoder_helpers;
2727

2828

29-
use std::hash::HashUtil;
3029
use std::u64;
3130
use std::io::WriterUtil;
3231
use std::io;

branches/dist-snap/src/librustc/metadata/encoder.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ use middle::typeck;
2121
use middle::astencode;
2222
use middle;
2323

24-
use std::hash::HashUtil;
2524
use std::hashmap::{HashMap, HashSet};
2625
use std::io;
2726
use std::str;

branches/dist-snap/src/libstd/hash.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,7 @@ pub trait Hash {
5959
* IterBytes trait, that feeds SipHash.
6060
*/
6161
fn hash_keyed(&self, k0: u64, k1: u64) -> u64;
62-
}
63-
64-
// When we have default methods, won't need this.
65-
pub trait HashUtil {
66-
fn hash(&self) -> u64;
67-
}
6862

69-
impl<A:Hash> HashUtil for A {
7063
#[inline]
7164
fn hash(&self) -> u64 { self.hash_keyed(0,0) }
7265
}

branches/dist-snap/src/test/run-pass/deriving-meta-multiple.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ struct Foo {
1919
}
2020

2121
pub fn main() {
22-
use std::hash::HashUtil; // necessary for IterBytes check
23-
2422
let a = Foo {bar: 4, baz: -3};
2523

2624
a == a; // check for Eq impl w/o testing its correctness

branches/dist-snap/src/test/run-pass/deriving-meta.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ struct Foo {
1717
}
1818

1919
pub fn main() {
20-
use std::hash::HashUtil; // necessary for IterBytes check
21-
2220
let a = Foo {bar: 4, baz: -3};
2321

2422
a == a; // check for Eq impl w/o testing its correctness

0 commit comments

Comments
 (0)