Skip to content

Commit d34b5e2

Browse files
committed
Rustup to rustc 1.51.0-nightly (b122908 2021-01-29)
2 parents 8faae29 + e67b72d commit d34b5e2

File tree

5 files changed

+8
-11
lines changed

5 files changed

+8
-11
lines changed

build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ done
3232

3333
# Build cg_clif
3434
unset CARGO_TARGET_DIR
35-
export RUSTFLAGS="-Zrun_dsymutil=no"
3635
unamestr=$(uname)
3736
if [[ "$unamestr" == 'Linux' ]]; then
3837
export RUSTFLAGS='-Clink-arg=-Wl,-rpath=$ORIGIN/../lib '$RUSTFLAGS

build_sysroot/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2021-01-25
1+
nightly-2021-01-30

src/constant.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,9 @@ pub(crate) fn codegen_constant<'tcx>(
134134
{
135135
Ok(const_val) => const_val,
136136
Err(_) => {
137-
if promoted.is_none() {
138-
fx.tcx
139-
.sess
140-
.span_err(constant.span, "erroneous constant encountered");
141-
}
137+
fx.tcx
138+
.sess
139+
.span_err(constant.span, "erroneous constant encountered");
142140
return crate::trap::trap_unreachable_ret_value(
143141
fx,
144142
fx.layout_of(const_.ty),

src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ mod vtable;
8282
mod prelude {
8383
pub(crate) use std::convert::{TryFrom, TryInto};
8484

85-
pub(crate) use rustc_ast::ast::{FloatTy, IntTy, UintTy};
8685
pub(crate) use rustc_span::Span;
8786

8887
pub(crate) use rustc_hir::def_id::{DefId, LOCAL_CRATE};
8988
pub(crate) use rustc_middle::bug;
9089
pub(crate) use rustc_middle::mir::{self, *};
9190
pub(crate) use rustc_middle::ty::layout::{self, TyAndLayout};
9291
pub(crate) use rustc_middle::ty::{
93-
self, Instance, InstanceDef, ParamEnv, Ty, TyCtxt, TypeAndMut, TypeFoldable,
92+
self, FloatTy, Instance, InstanceDef, IntTy, ParamEnv, Ty, TyCtxt, TypeAndMut,
93+
TypeFoldable, UintTy,
9494
};
9595
pub(crate) use rustc_target::abi::{Abi, LayoutOf, Scalar, Size, VariantIdx};
9696

0 commit comments

Comments
 (0)