diff options
| author | Oneirical <manchot@videotron.ca> | 2024-06-14 12:08:43 -0400 |
|---|---|---|
| committer | Oneirical <manchot@videotron.ca> | 2024-07-08 09:59:08 -0400 |
| commit | d9162fd97f1655a145b7975b8e7af7e37f4de84d (patch) | |
| tree | 6dd1884ec69bb513b19bc18e11449c07c0e3cda4 | |
| parent | 2c7afc114d7ccc9bbc1dce29f1be1dca343e722f (diff) | |
| download | rust-d9162fd97f1655a145b7975b8e7af7e37f4de84d.tar.gz rust-d9162fd97f1655a145b7975b8e7af7e37f4de84d.zip | |
rewrite and rename issue-18943 to rmake
| -rw-r--r-- | src/tools/tidy/src/allowed_run_make_makefiles.txt | 1 | ||||
| -rw-r--r-- | tests/run-make/issue-18943/Makefile | 7 | ||||
| -rw-r--r-- | tests/run-make/lib-trait-for-trait-no-ice/foo.rs (renamed from tests/run-make/issue-18943/foo.rs) | 0 | ||||
| -rw-r--r-- | tests/run-make/lib-trait-for-trait-no-ice/rmake.rs | 13 | ||||
| -rw-r--r-- | tests/run-make/std-core-cycle/rmake.rs | 1 |
5 files changed, 13 insertions, 9 deletions
diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt index 8dc48d42f67..23b3b91604d 100644 --- 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 deleted file mode 100644 index fc40d756d6f..00000000000 --- a/tests/run-make/issue-18943/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -include ../tools.mk - -# Regression test for ICE #18943 when compiling as lib - -all: - $(RUSTC) foo.rs --crate-type lib - $(call REMOVE_RLIBS,foo) && exit 0 || exit 1 diff --git a/tests/run-make/issue-18943/foo.rs b/tests/run-make/lib-trait-for-trait-no-ice/foo.rs index 54daec8dd1e..54daec8dd1e 100644 --- a/tests/run-make/issue-18943/foo.rs +++ b/tests/run-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 new file mode 100644 index 00000000000..5f8c998874b --- /dev/null +++ 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 index 0f63c3f7ce4..162b783aeb9 100644 --- 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(); } - |