Skip to content

Commit

Permalink
Auto merge of #2680 - RalfJung:rustup, r=RalfJung
Browse files Browse the repository at this point in the history
Rustup
  • Loading branch information
bors committed Nov 20, 2022
2 parents a6a38dc + 70fab06 commit 53aec46
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 31 deletions.
2 changes: 1 addition & 1 deletion rust-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2f8d8040166a730d0da7bba0f2864f0ef7ff6364
7477c1f4f7d6bef037d523099b240d22aa1b63a0
5 changes: 0 additions & 5 deletions src/shims/intrinsics/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -368,11 +368,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
}

// Other
"exact_div" => {
let [num, denom] = check_arg_count(args)?;
this.exact_div(&this.read_immediate(num)?, &this.read_immediate(denom)?, dest)?;
}

"breakpoint" => {
let [] = check_arg_count(args)?;
// normally this would raise a SIGTRAP, which aborts if no debugger is connected
Expand Down
24 changes: 0 additions & 24 deletions tests/pass/issues/issue-miri-2433.rs

This file was deleted.

2 changes: 1 addition & 1 deletion tests/pass/panic/catch_panic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ fn main() {
});

test(Some("align_offset: align is not a power-of-two"), |_old_val| {
(0usize as *const u8).align_offset(3);
let _ = (0usize as *const u8).align_offset(3);
loop {}
});

Expand Down

0 comments on commit 53aec46

Please sign in to comment.