Auto merge of #62332 - Mark-Simulacrum:beta-next, r=pietroalbini

[beta] master -> beta promotion for 1.37 This includes the release note patch from stable. r? @pietroalbini
rust-lang · Jul 4, 2019 · 178aa66 · 178aa66
2 parents 8301de1 + 421160e
commit 178aa66
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/RELEASES.md b/RELEASES.md
@@ -39,7 +39,7 @@ Stabilized APIs
 - [`mem::MaybeUninit`]
 - [`pointer::align_offset`]
 - [`future::Future`]
-- [`task::Context`] 
+- [`task::Context`]
 - [`task::RawWaker`]
 - [`task::RawWakerVTable`]
 - [`task::Waker`]
@@ -61,6 +61,8 @@ Misc
 
 Compatibility Notes
 -------------------
+- [`std::arch::x86::_rdtsc` returns `u64` instead of `i64`][stdsimd/559]
+- [`std::arch::x86_64::_mm_shuffle_ps` takes an `i32` instead of `u32` for `mask`][stdsimd/522]
 - With the stabilisation of `mem::MaybeUninit`, `mem::uninitialized` use is no
   longer recommended, and will be deprecated in 1.38.0.
 
@@ -97,7 +99,8 @@ Compatibility Notes
 [`task::Poll`]: https://doc.rust-lang.org/beta/std/task/enum.Poll.html
 [clippy-1-36-0]: https://github.com/rust-lang/rust-clippy/blob/master/CHANGELOG.md#rust-136
 [cargo-1-36-0]: https://github.com/rust-lang/cargo/blob/master/CHANGELOG.md#cargo-136-2019-07-04
-
+[stdsimd/522]: https://github.com/rust-lang-nursery/stdsimd/issues/522
+[stdsimd/559]: https://github.com/rust-lang-nursery/stdsimd/issues/559
 
 Version 1.35.0 (2019-05-23)
 ==========================

diff --git a/src/ci/run.sh b/src/ci/run.sh
@@ -45,7 +45,7 @@ fi
 #
 # FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
 #        either automatically or manually.
-export RUST_RELEASE_CHANNEL=nightly
+export RUST_RELEASE_CHANNEL=beta
 if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then
   RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
   RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"

diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs
@@ -2608,6 +2608,12 @@ mod test_map {
     use realstd::collections::CollectionAllocErr::*;
     use realstd::usize;
 
+    // https://github.com/rust-lang/rust/issues/62301
+    fn _assert_hashmap_is_unwind_safe() {
+        fn assert_unwind_safe<T: crate::panic::UnwindSafe>() {}
+        assert_unwind_safe::<HashMap<(), crate::cell::UnsafeCell<()>>>();
+    }
+
     #[test]
     fn test_zero_capacities() {
         type HM = HashMap<i32, i32>;

diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs
@@ -4,6 +4,7 @@
 
 use crate::any::Any;
 use crate::cell::UnsafeCell;
+use crate::collections;
 use crate::fmt;
 use crate::future::Future;
 use crate::pin::Pin;
@@ -285,6 +286,11 @@ impl RefUnwindSafe for atomic::AtomicBool {}
 #[stable(feature = "unwind_safe_atomic_refs", since = "1.14.0")]
 impl<T> RefUnwindSafe for atomic::AtomicPtr<T> {}
 
+// https://github.com/rust-lang/rust/issues/62301
+#[stable(feature = "hashbrown", since = "1.36.0")]
+impl<K, V, S> UnwindSafe for collections::HashMap<K, V, S>
+    where K: UnwindSafe, V: UnwindSafe, S: UnwindSafe {}
+
 #[stable(feature = "catch_unwind", since = "1.9.0")]
 impl<T> Deref for AssertUnwindSafe<T> {
     type Target = T;

diff --git a/src/stage0.txt b/src/stage0.txt
@@ -12,9 +12,9 @@
 # source tarball for a stable release you'll likely see `1.x.0` for rustc and
 # `0.x.0` for Cargo where they were released on `date`.
 
-date: 2019-05-23
-rustc: beta
-cargo: beta
+date: 2019-07-03
+rustc: 1.36.0
+cargo: 0.37.0
 
 # When making a stable release the process currently looks like:
 #
@@ -34,4 +34,4 @@ cargo: beta
 # looking at a beta source tarball and it's uncommented we'll shortly comment it
 # out.
 
-#dev: 1
+dev: 1