Skip to content

Commit 2bc1d40

Browse files
committed
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
2 parents 96d700f + f667e7d commit 2bc1d40

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

src/ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fi
4343
#
4444
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
4545
# either automatically or manually.
46-
export RUST_RELEASE_CHANNEL=nightly
46+
export RUST_RELEASE_CHANNEL=beta
4747
if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
4848
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL"
4949
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"

src/libstd/num.rs

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ pub use core::num::Wrapping;
1313

1414
#[stable(feature = "nonzero", since = "1.28.0")]
1515
pub use core::num::{NonZeroU8, NonZeroU16, NonZeroU32, NonZeroU64, NonZeroU128, NonZeroUsize};
16+
#[stable(feature = "signed_nonzero", since = "1.34.0")]
17+
pub use core::num::{NonZeroI8, NonZeroI16, NonZeroI32, NonZeroI64, NonZeroI128, NonZeroIsize};
1618

1719
#[cfg(test)] use crate::fmt;
1820
#[cfg(test)] use crate::ops::{Add, Sub, Mul, Div, Rem};

src/stage0.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
1313
# `0.x.0` for Cargo where they were released on `date`.
1414

15-
date: 2019-03-20
16-
rustc: beta
17-
cargo: beta
15+
date: 2019-04-08
16+
rustc: 1.34.0
17+
cargo: 0.35.0
1818

1919
# When making a stable release the process currently looks like:
2020
#
@@ -34,4 +34,4 @@ cargo: beta
3434
# looking at a beta source tarball and it's uncommented we'll shortly comment it
3535
# out.
3636

37-
#dev: 1
37+
dev: 1

src/test/ui/try-block/try-block-bad-type.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ LL | Err("")?;
66
|
77
= help: the following implementations were found:
88
<i32 as std::convert::From<bool>>
9-
<i32 as std::convert::From<core::num::NonZeroI32>>
109
<i32 as std::convert::From<i16>>
1110
<i32 as std::convert::From<i8>>
11+
<i32 as std::convert::From<std::num::NonZeroI32>>
1212
and 2 others
1313
= note: required by `std::convert::From::from`
1414

0 commit comments

Comments
 (0)