Skip to content

Commit 4f6f264

Browse files
committed
Auto merge of #909 - RalfJung:deny-warn, r=oli-obk
deny warnings on CI
2 parents c71b240 + f9241be commit 4f6f264

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

miri

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fi
4545
# We set the rpath so that Miri finds the private rustc libraries it needs.
4646
# We enable debug-assertions to get tracing.
4747
# We enable line-only debuginfo for backtraces.
48-
export RUSTFLAGS="-C link-args=-Wl,-rpath,$LIBDIR -C debug-assertions -C debuginfo=1"
48+
export RUSTFLAGS="-C link-args=-Wl,-rpath,$LIBDIR -C debug-assertions -C debuginfo=1 $RUSTC_EXTRA_FLAGS"
4949

5050
## Helper functions
5151

src/eval.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
4040
MemoryExtra::new(StdRng::seed_from_u64(config.seed.unwrap_or(0)), config.validate),
4141
);
4242
// Complete initialization.
43-
EnvVars::init(&mut ecx, config.communicate);
43+
EnvVars::init(&mut ecx);
4444

4545
// Setup first stack-frame
4646
let main_instance = ty::Instance::mono(ecx.tcx.tcx, main_id);

src/shims/env.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ pub struct EnvVars {
1313
impl EnvVars {
1414
pub(crate) fn init<'mir, 'tcx>(
1515
ecx: &mut InterpCx<'mir, 'tcx, Evaluator<'tcx>>,
16-
communicate: bool,
1716
) {
18-
if communicate {
17+
if ecx.machine.communicate {
1918
for (name, value) in std::env::vars() {
2019
let value = alloc_env_value(value.as_bytes(), ecx.memory_mut());
2120
ecx.machine.env_vars.map.insert(name.into_bytes(), value);

travis.sh

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ else
88
FOREIGN_TARGET=i686-unknown-linux-gnu
99
fi
1010
export CARGO_EXTRA_FLAGS="--all-features"
11+
export RUSTC_EXTRA_FLAGS="-D warnings"
1112

1213
# Prepare
1314
echo "Build and install miri"

0 commit comments

Comments
 (0)