Skip to content

Commit b595e25

Browse files
authored
Merge pull request #462 from RalfJung/needs-drop
remove needs_drop impl
2 parents 110c98b + eaff451 commit b595e25

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ script:
3838
xargo/build.sh &&
3939
export MIRI_SYSROOT=~/.xargo/HOST
4040
- |
41-
# Test `cargo miri`
41+
# run all tests with full mir
42+
cargo test --release --all-features
43+
- |
44+
# test `cargo miri`
4245
cd cargo-miri-test &&
4346
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
4447
cargo miri -q -- -Zmiri-start-fn
@@ -50,12 +53,9 @@ script:
5053
diff -u stdout.ref stdout.real &&
5154
diff -u stderr.ref stderr.real
5255
fi &&
53-
# Test `cargo miri test`
56+
# test `cargo miri test`
5457
cargo miri test &&
5558
cd ..
56-
- |
57-
# and run all tests with full mir
58-
cargo test --release --all-features
5959
6060
notifications:
6161
email:

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2018-09-29
1+
nightly-2018-10-01

src/intrinsic.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -272,16 +272,6 @@ impl<'a, 'mir, 'tcx> EvalContextExt<'tcx> for EvalContext<'a, 'mir, 'tcx, super:
272272
self.copy_op(args[1], ptr.into())?;
273273
}
274274

275-
"needs_drop" => {
276-
let ty = substs.type_at(0);
277-
let env = ty::ParamEnv::reveal_all();
278-
let needs_drop = ty.needs_drop(self.tcx.tcx, env);
279-
self.write_scalar(
280-
Scalar::from_bool(needs_drop),
281-
dest,
282-
)?;
283-
}
284-
285275
"offset" => {
286276
let offset = self.read_scalar(args[1])?.to_isize(&self)?;
287277
let ptr = self.read_scalar(args[0])?.not_undef()?;

0 commit comments

Comments
 (0)