Skip to content

Commit 65f0008

Browse files
committed
Auto merge of #2892 - RalfJung:rustup, r=RalfJung
Rustup
2 parents 85e8c37 + 1e119e0 commit 65f0008

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

ci.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ function run_tests {
4545
# them. Also error locations change so we don't run the failing tests.
4646
# We explicitly enable debug-assertions here, they are disabled by -O but we have tests
4747
# which exist to check that we panic on debug assertion failures.
48-
#FIXME: Disabled due to <https://github.com/rust-lang/rust/issues/111422>.
49-
#MIRIFLAGS="${MIRIFLAGS:-} -O -Zmir-opt-level=4 -Cdebug-assertions=yes" MIRI_SKIP_UI_CHECKS=1 ./miri test -- tests/{pass,panic}
48+
MIRIFLAGS="${MIRIFLAGS:-} -O -Zmir-opt-level=4 -Cdebug-assertions=yes" MIRI_SKIP_UI_CHECKS=1 ./miri test -- tests/{pass,panic}
5049

5150
# Also run some many-seeds tests. 64 seeds means this takes around a minute per test.
5251
for FILE in tests/many-seeds/*.rs; do

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
699a862a3d4e4a2d5603c93297c0c44021ea72f5
1+
0b795044c6f0854445f1f2bb6443e87848e150d1

0 commit comments

Comments
 (0)