diff options
| author | Eduard Burtescu <edy.burt@gmail.com> | 2015-01-16 17:01:02 +0200 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2015-01-17 16:37:34 -0800 |
| commit | 89b80faa8ef2b52f5adc423cfcfed69b313ea1b7 (patch) | |
| tree | 6398229035eb8fac2a35fe6eb3a72d3efad3dd12 /src/librustc | |
| parent | f4f10dba2975b51c2d2c92157018db3ac13d4d4a (diff) | |
Register new snapshots.
Diffstat (limited to 'src/librustc')
| -rw-r--r-- | src/librustc/metadata/filesearch.rs | 4 | ||||
| -rw-r--r-- | src/librustc/middle/ty.rs | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/librustc/metadata/filesearch.rs b/src/librustc/metadata/filesearch.rs index 55a23aa516e..ddee1f79d6a 100644 --- a/src/librustc/metadata/filesearch.rs +++ b/src/librustc/metadata/filesearch.rs @@ -274,12 +274,12 @@ fn find_libdir(sysroot: &Path) -> String { } } - #[cfg(any(all(stage0, target_word_size = "64"), all(not(stage0), target_pointer_width = "64")))] + #[cfg(target_pointer_width = "64")] fn primary_libdir_name() -> String { "lib64".to_string() } - #[cfg(any(all(stage0, target_word_size = "32"), all(not(stage0), target_pointer_width = "32")))] + #[cfg(target_pointer_width = "32")] fn primary_libdir_name() -> String { "lib32".to_string() } diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index c72fbc74565..34e4993c54d 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -947,13 +947,6 @@ impl<'tcx> PartialEq for TyS<'tcx> { } impl<'tcx> Eq for TyS<'tcx> {} -#[cfg(stage0)] -impl<'tcx, S: Writer> Hash<S> for TyS<'tcx> { - fn hash(&self, s: &mut S) { - (self as *const _).hash(s) - } -} -#[cfg(not(stage0))] impl<'tcx, S: Writer + Hasher> Hash<S> for TyS<'tcx> { fn hash(&self, s: &mut S) { (self as *const _).hash(s) |
