Skip to content

Commit e253f79

Browse files
authored
Rollup merge of rust-lang#73981 - ehuss:remove-ignore-stage1, r=nikomatsakis
Remove some `ignore-stage1` annotations. These tests appear to no longer need the `ignore-stage1` marker. - `run-make-fulldeps/issue-37839` and `run-make-fulldeps/issue-37893`: I believe these were due to the use of proc-macros, and probably were just missed in rust-lang#49219 which fixed the proc-macro compatibility. - `compile-fail/asm-src-loc-codegen-units.rs`: This was due to an old issue with landing pads (as mentioned in the linked issue rust-lang#20184). `-Zno-landing-pads` was an option when building the first stage (it was much faster), but somewhere along the way (I think the switch from makefiles to rustbuild), the option was removed. - NOTE: This test doesn't actually test what it was originally written for, and is probably mostly pointless now. This test was asserting the message "build without -C codegen-units for more exact errors", but that was removed in rust-lang#42682. It is now in essence identical to `asm-src-loc.rs`.
2 parents 240c4b3 + 9b6b400 commit e253f79

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

src/test/compile-fail/asm-src-loc-codegen-units.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// WONTFIX(#20184) Needs landing pads (not present in stage1) or the compiler hangs.
2-
// ignore-stage1
31
// compile-flags: -C codegen-units=2
42
// ignore-emscripten
53

src/test/run-make-fulldeps/issue-37839/Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
-include ../tools.mk
22

3-
# ignore-stage1
4-
53
all:
64
$(RUSTC) a.rs && $(RUSTC) b.rs
75
$(BARE_RUSTC) c.rs -L dependency=$(TMPDIR) --extern b=$(TMPDIR)/libb.rlib \
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
-include ../tools.mk
22

3-
# ignore-stage1
4-
53
all:
64
$(RUSTC) a.rs && $(RUSTC) b.rs && $(RUSTC) c.rs

0 commit comments

Comments
 (0)