Skip to content

Commit a6984f5

Browse files
committed
Fix tests
1 parent 2a2b3ea commit a6984f5

6 files changed

+10
-10
lines changed

Readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ To send the changes to the rust repo:
292292
```bash
293293
cd ../rust
294294
git pull origin master
295-
git checkbout -b subtree-update_cg_gcc_YYYY-MM-DD
295+
git checkout -b subtree-update_cg_gcc_YYYY-MM-DD
296296
PATH="$HOME/bin:$PATH" ~/bin/git-subtree pull --prefix=compiler/rustc_codegen_gcc/ https://github.com/rust-lang/rustc_codegen_gcc.git master
297297
git push
298298
```

failing-non-lto-tests.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ tests/ui/lto/lto-many-codegen-units.rs
55
tests/ui/lto/issue-100772.rs
66
tests/ui/lto/lto-rustc-loads-linker-plugin.rs
77
tests/ui/panic-runtime/lto-unwind.rs
8-
tests/ui/sanitize/issue-111184-generator-witness.rs
8+
tests/ui/sanitize/issue-111184-coroutine-witness.rs
99
tests/ui/sepcomp/sepcomp-lib-lto.rs
1010
tests/ui/lto/lto-opt-level-s.rs
1111
tests/ui/lto/lto-opt-level-z.rs

failing-ui-tests.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ tests/ui/cfg/cfg-panic-abort.rs
2121
tests/ui/drop/dynamic-drop-async.rs
2222
tests/ui/drop/repeat-drop.rs
2323
tests/ui/fmt/format-args-capture.rs
24-
tests/ui/generator/panic-drops-resume.rs
25-
tests/ui/generator/panic-drops.rs
24+
tests/ui/coroutine/panic-drops-resume.rs
25+
tests/ui/coroutine/panic-drops.rs
2626
tests/ui/intrinsics/panic-uninitialized-zeroed.rs
2727
tests/ui/iterators/iter-sum-overflow-debug.rs
2828
tests/ui/iterators/iter-sum-overflow-overflow-checks.rs
@@ -53,7 +53,7 @@ tests/ui/simd/issue-89193.rs
5353
tests/ui/statics/issue-91050-1.rs
5454
tests/ui/statics/issue-91050-2.rs
5555
tests/ui/alloc-error/default-alloc-error-hook.rs
56-
tests/ui/generator/panic-safe.rs
56+
tests/ui/coroutine/panic-safe.rs
5757
tests/ui/issues/issue-14875.rs
5858
tests/ui/issues/issue-29948.rs
5959
tests/ui/panics/nested_panic_caught.rs
@@ -70,5 +70,5 @@ tests/ui/lto/lto-thin-rustc-loads-linker-plugin.rs
7070
tests/ui/lto/all-crates.rs
7171
tests/ui/async-await/deep-futures-are-freeze.rs
7272
tests/ui/closures/capture-unsized-by-ref.rs
73-
tests/ui/generator/resume-after-return.rs
73+
tests/ui/coroutine/resume-after-return.rs
7474
tests/ui/macros/rfc-2011-nicer-assert-messages/all-expr-kinds.rs

failing-ui-tests12.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ tests/ui/rfcs/rfc-1937-termination-trait/termination-trait-in-test.rs
2828
tests/ui/async-await/async-fn-size-moved-locals.rs
2929
tests/ui/async-await/async-fn-size-uninit-locals.rs
3030
tests/ui/cfg/cfg-panic.rs
31-
tests/ui/generator/size-moved-locals.rs
31+
tests/ui/coroutine/size-moved-locals.rs
3232
tests/ui/macros/rfc-2011-nicer-assert-messages/all-not-available-cases.rs
3333
tests/ui/simd/intrinsic/generic-gather-pass.rs
3434
tests/ui/simd/issue-85915-simd-ptrs.rs

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2023-10-25"
2+
channel = "nightly-2023-10-21"
33
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

test.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,10 @@ function test_rustc() {
371371

372372
git checkout -- tests/ui/issues/auxiliary/issue-3136-a.rs # contains //~ERROR, but shouldn't be removed
373373

374-
rm -r tests/ui/{abi*,extern/,unsized-locals/,proc-macro/,threads-sendsync/,thinlto/,borrowck/,chalkify/bugs/,test*,consts/const-float-bits-reject-conv.rs,consts/issue-miri-1910.rs} || true
374+
rm -r tests/ui/{abi*,extern/,unsized-locals/,proc-macro/,threads-sendsync/,borrowck/,test*,consts/issue-miri-1910.rs} || true
375375
rm tests/ui/mir/mir_heavy_promoted.rs # this test is oom-killed in the CI.
376376
# Tests generating errors.
377-
rm tests/ui/consts/const-eval/nonnull_as_ref_ub.rs tests/ui/consts/issue-94675.rs
377+
rm tests/ui/consts/issue-94675.rs
378378
for test in $(rg --files-with-matches "thread" tests/ui); do
379379
rm $test
380380
done

0 commit comments

Comments
 (0)