diff options
| author | bors <bors@rust-lang.org> | 2019-04-10 21:45:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-10 21:45:40 +0000 |
| commit | 2bc1d406dd5eda8bb3fd0d08a9a1a534740f9e79 (patch) | |
| tree | 9f17bc3e77aa5e6cb02c5d50e60eebc98e96b1a1 | |
| parent | 96d700f1b7bc9c53fa0d11567adb1ed2c1c27e79 (diff) | |
| parent | f667e7db3af5ba156bb0e4b6b097e226a32e25ef (diff) | |
| download | rust-2bc1d406dd5eda8bb3fd0d08a9a1a534740f9e79.tar.gz rust-2bc1d406dd5eda8bb3fd0d08a9a1a534740f9e79.zip | |
Auto merge of #59849 - pietroalbini:beta-next, r=pietroalbini
[beta] Prepare beta 1.35.0 Also cherry-picked: * #59835: Re-export NonZero signed variant in std cc @Mark-Simulacrum @rust-lang/release r? @ghost
| -rwxr-xr-x | src/ci/run.sh | 2 | ||||
| -rw-r--r-- | src/libstd/num.rs | 2 | ||||
| -rw-r--r-- | src/stage0.txt | 8 | ||||
| -rw-r--r-- | src/test/ui/try-block/try-block-bad-type.stderr | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/ci/run.sh b/src/ci/run.sh index 42d0d7db596..07e01b7e1e0 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -43,7 +43,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" != "" ]; 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/num.rs b/src/libstd/num.rs index 828d5720eec..d67d0b55a79 100644 --- a/src/libstd/num.rs +++ b/src/libstd/num.rs @@ -13,6 +13,8 @@ pub use core::num::Wrapping; #[stable(feature = "nonzero", since = "1.28.0")] pub use core::num::{NonZeroU8, NonZeroU16, NonZeroU32, NonZeroU64, NonZeroU128, NonZeroUsize}; +#[stable(feature = "signed_nonzero", since = "1.34.0")] +pub use core::num::{NonZeroI8, NonZeroI16, NonZeroI32, NonZeroI64, NonZeroI128, NonZeroIsize}; #[cfg(test)] use crate::fmt; #[cfg(test)] use crate::ops::{Add, Sub, Mul, Div, Rem}; diff --git a/src/stage0.txt b/src/stage0.txt index 43610f9068f..f11ed6b89b4 100644 --- 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-03-20 -rustc: beta -cargo: beta +date: 2019-04-08 +rustc: 1.34.0 +cargo: 0.35.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 diff --git a/src/test/ui/try-block/try-block-bad-type.stderr b/src/test/ui/try-block/try-block-bad-type.stderr index 6687bd9d9e1..07e7149793c 100644 --- a/src/test/ui/try-block/try-block-bad-type.stderr +++ b/src/test/ui/try-block/try-block-bad-type.stderr @@ -6,9 +6,9 @@ LL | Err("")?; | = help: the following implementations were found: <i32 as std::convert::From<bool>> - <i32 as std::convert::From<core::num::NonZeroI32>> <i32 as std::convert::From<i16>> <i32 as std::convert::From<i8>> + <i32 as std::convert::From<std::num::NonZeroI32>> and 2 others = note: required by `std::convert::From::from` |