Merge branch 'master' of git://github.com/rust-lang/rust

* 'master' of git://github.com/rust-lang/rust: (70 commits)
  sanitizer-dylib: only run where std for x86_64-linux is available
  travis: Fix build order of dist-x86-linux
  fix the sanitizer-dylib test on non x86_64 linux hosts
  dist-x86-linux: install newer kernel headers
  enable sanitizers on build job that tests x86_64 linux
  enable sanitizers on x86_64-linux releases
  use helper function in the rebuild logic of the rustc_*san crates
  build/test the sanitizers only when --enable-sanitizers is used
  sanitizer support
  Add missing urls on join_paths
  Add test for #27433
  Add more examples, get everything passing at last.
  Remove some leftover makefiles.
  Add more test for rustdoc --test
  Rename manifest_version to manifest-version
  reference: clarify #[cfg] section
  Bump stable release date
  rustbuild: Clean build/dist on `make clean`
  Add missing urls for current_dir
  review nits
  ...

14 files changed, 2 insertions, 20 deletions

diff --git a/src/libcore/Cargo.toml b/src/libcore/Cargo.toml
index 4f7cd7b016d..e847c7fa3a0 100644
--- a/src/libcore/Cargo.toml
+++ b/src/libcore/Cargo.toml
@@ -14,5 +14,5 @@ name = "coretest"
 path = "../libcoretest/lib.rs"
 
 [[bench]]
-name = "corebench"
-path = "../libcore/bench/lib.rs"
+name = "corebenches"
+path = "../libcore/benches/lib.rs"
diff --git a/src/libcore/bench/any.rs b/src/libcore/benches/any.rs
index 67e02cf9509..67e02cf9509 100644
--- a/src/libcore/bench/any.rs
+++ b/src/libcore/benches/any.rs
diff --git a/src/libcore/bench/hash/mod.rs b/src/libcore/benches/hash/mod.rs
index 55d9e3e0913..55d9e3e0913 100644
--- a/src/libcore/bench/hash/mod.rs
+++ b/src/libcore/benches/hash/mod.rs
diff --git a/src/libcore/bench/hash/sip.rs b/src/libcore/benches/hash/sip.rs
index 3379c85bbec..3379c85bbec 100644
--- a/src/libcore/bench/hash/sip.rs
+++ b/src/libcore/benches/hash/sip.rs
diff --git a/src/libcore/bench/iter.rs b/src/libcore/benches/iter.rs
index 93d38a5bc83..93d38a5bc83 100644
--- a/src/libcore/bench/iter.rs
+++ b/src/libcore/benches/iter.rs
diff --git a/src/libcore/bench/lib.rs b/src/libcore/benches/lib.rs
index d2db329da79..d2db329da79 100644
--- a/src/libcore/bench/lib.rs
+++ b/src/libcore/benches/lib.rs
diff --git a/src/libcore/bench/mem.rs b/src/libcore/benches/mem.rs
index 8e541d92a7f..8e541d92a7f 100644
--- a/src/libcore/bench/mem.rs
+++ b/src/libcore/benches/mem.rs
diff --git a/src/libcore/bench/num/dec2flt/mod.rs b/src/libcore/benches/num/dec2flt/mod.rs
index 562866e1177..562866e1177 100644
--- a/src/libcore/bench/num/dec2flt/mod.rs
+++ b/src/libcore/benches/num/dec2flt/mod.rs
diff --git a/src/libcore/bench/num/flt2dec/mod.rs b/src/libcore/benches/num/flt2dec/mod.rs
index 1de2bf4921f..1de2bf4921f 100644
--- a/src/libcore/bench/num/flt2dec/mod.rs
+++ b/src/libcore/benches/num/flt2dec/mod.rs
diff --git a/src/libcore/bench/num/flt2dec/strategy/dragon.rs b/src/libcore/benches/num/flt2dec/strategy/dragon.rs
index 6824cf40ed2..6824cf40ed2 100644
--- a/src/libcore/bench/num/flt2dec/strategy/dragon.rs
+++ b/src/libcore/benches/num/flt2dec/strategy/dragon.rs
diff --git a/src/libcore/bench/num/flt2dec/strategy/grisu.rs b/src/libcore/benches/num/flt2dec/strategy/grisu.rs
index 82e1a858fca..82e1a858fca 100644
--- a/src/libcore/bench/num/flt2dec/strategy/grisu.rs
+++ b/src/libcore/benches/num/flt2dec/strategy/grisu.rs
diff --git a/src/libcore/bench/num/mod.rs b/src/libcore/benches/num/mod.rs
index 55f0bdb57ec..55f0bdb57ec 100644
--- a/src/libcore/bench/num/mod.rs
+++ b/src/libcore/benches/num/mod.rs
diff --git a/src/libcore/bench/ops.rs b/src/libcore/benches/ops.rs
index 7f36a4b0771..7f36a4b0771 100644
--- a/src/libcore/bench/ops.rs
+++ b/src/libcore/benches/ops.rs
diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs
index 58cd0af7ee3..743e3c41170 100644
--- a/src/libcore/sync/atomic.rs
+++ b/src/libcore/sync/atomic.rs
@@ -1318,24 +1318,6 @@ atomic_int! {
     unstable(feature = "integer_atomics", issue = "32976"),
     u64 AtomicU64 ATOMIC_U64_INIT
 }
-#[cfg(not(stage0))]
-#[cfg(target_has_atomic = "128")]
-atomic_int! {
-    unstable(feature = "i128", issue = "35118"),
-    unstable(feature = "i128", issue = "35118"),
-    unstable(feature = "i128", issue = "35118"),
-    unstable(feature = "i128", issue = "35118"),
-    i128 AtomicI128 ATOMIC_I128_INIT
-}
-#[cfg(not(stage0))]
-#[cfg(target_has_atomic = "128")]
-atomic_int! {
-    unstable(feature = "i128", issue = "35118"),
-    unstable(feature = "i128", issue = "35118"),
-    unstable(feature = "i128", issue = "35118"),
-    unstable(feature = "i128", issue = "35118"),
-    u128 AtomicU128 ATOMIC_U128_INIT
-}
 #[cfg(target_has_atomic = "ptr")]
 atomic_int!{
     stable(feature = "rust1", since = "1.0.0"),