rewrite and rename issue-18943 to rmake

rust-lang-ci · Jul 8, 2024 · d9162fd · d9162fd
1 parent 2c7afc1
commit d9162fd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -52,7 +52,6 @@ run-make/issue-107094/Makefile
 run-make/issue-109934-lto-debuginfo/Makefile
 run-make/issue-14698/Makefile
 run-make/issue-15460/Makefile
-run-make/issue-18943/Makefile
 run-make/issue-22131/Makefile
 run-make/issue-25581/Makefile
 run-make/issue-26006/Makefile

diff --git a/tests/run-make/issue-18943/Makefile b/tests/run-make/issue-18943/Makefile
diff --git a/tests/run-make/issue-18943/foo.rs → ...un-make/lib-trait-for-trait-no-ice/foo.rs b/tests/run-make/issue-18943/foo.rs → ...un-make/lib-trait-for-trait-no-ice/foo.rs
diff --git a/tests/run-make/lib-trait-for-trait-no-ice/rmake.rs b/tests/run-make/lib-trait-for-trait-no-ice/rmake.rs
@@ -0,0 +1,13 @@
+// Inside a library, implementing a trait for another trait
+// with a lifetime used to cause an internal compiler error (ICE).
+// This test checks that this bug does not make a resurgence -
+// first by ensuring successful compilation, then verifying that
+// the lib crate-type flag was actually followed.
+// See https://github.com/rust-lang/rust/issues/18943
+
+use run_make_support::{count_rlibs, rustc};
+
+fn main() {
+    rustc().input("foo.rs").crate_type("lib").run();
+    assert_eq!(count_rlibs("foo"), 1);
+}
diff --git a/tests/run-make/std-core-cycle/rmake.rs b/tests/run-make/std-core-cycle/rmake.rs
@@ -25,4 +25,3 @@ fn main() {
     rustc_foo.run();
     rustc_foo_panic.run();
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,4 +25,3 @@ fn main() {
		rustc_foo.run();
		rustc_foo_panic.run();
		}