From 333c1bceebdd29d0c61577de6d5632c056b43745 Mon Sep 17 00:00:00 2001 From: Ben Kimock Date: Sat, 11 May 2024 19:29:07 -0400 Subject: [PATCH] Fix some minor issues from the ui-test auto-porting --- tests/codegen-units/partitioning/extern-drop-glue.rs | 4 +--- tests/codegen-units/partitioning/extern-generic.rs | 3 +-- tests/codegen-units/partitioning/incremental-merging.rs | 2 +- .../codegen-units/partitioning/inlining-from-extern-crate.rs | 3 +-- tests/codegen-units/partitioning/local-drop-glue.rs | 3 +-- tests/codegen-units/partitioning/local-generic.rs | 2 +- .../codegen-units/partitioning/local-inlining-but-not-all.rs | 3 +-- tests/codegen-units/partitioning/local-inlining.rs | 3 +-- tests/codegen-units/partitioning/local-transitive-inlining.rs | 3 +-- .../codegen-units/partitioning/methods-are-with-self-type.rs | 3 +-- tests/codegen-units/partitioning/regular-modules.rs | 2 +- tests/codegen-units/partitioning/shared-generics.rs | 1 - tests/codegen-units/partitioning/statics.rs | 2 +- tests/codegen-units/partitioning/vtable-through-const.rs | 4 +--- 14 files changed, 13 insertions(+), 25 deletions(-) diff --git a/tests/codegen-units/partitioning/extern-drop-glue.rs b/tests/codegen-units/partitioning/extern-drop-glue.rs index 84eb802f264b8..32b5fca61f7ff 100644 --- a/tests/codegen-units/partitioning/extern-drop-glue.rs +++ b/tests/codegen-units/partitioning/extern-drop-glue.rs @@ -1,7 +1,5 @@ -// - // We specify incremental here because we want to test the partitioning for -//@ incremental compilation +// incremental compilation // We specify opt-level=0 because `drop_in_place` is `Internal` when optimizing //@ incremental //@ compile-flags:-Zprint-mono-items=lazy diff --git a/tests/codegen-units/partitioning/extern-generic.rs b/tests/codegen-units/partitioning/extern-generic.rs index abd3918094d74..24dc1d4ef18df 100644 --- a/tests/codegen-units/partitioning/extern-generic.rs +++ b/tests/codegen-units/partitioning/extern-generic.rs @@ -1,6 +1,5 @@ -// // We specify incremental here because we want to test the partitioning for -//@ incremental compilation +// incremental compilation //@ incremental //@ compile-flags:-Zprint-mono-items=eager -Zshare-generics=y diff --git a/tests/codegen-units/partitioning/incremental-merging.rs b/tests/codegen-units/partitioning/incremental-merging.rs index b44090c866a0f..0f227f225c7ec 100644 --- a/tests/codegen-units/partitioning/incremental-merging.rs +++ b/tests/codegen-units/partitioning/incremental-merging.rs @@ -1,5 +1,5 @@ // We specify incremental here because we want to test the partitioning for -//@ incremental compilation +// incremental compilation //@ incremental //@ compile-flags:-Zprint-mono-items=lazy //@ compile-flags:-Ccodegen-units=3 diff --git a/tests/codegen-units/partitioning/inlining-from-extern-crate.rs b/tests/codegen-units/partitioning/inlining-from-extern-crate.rs index 74734d3cf38a1..704c11c3f843b 100644 --- a/tests/codegen-units/partitioning/inlining-from-extern-crate.rs +++ b/tests/codegen-units/partitioning/inlining-from-extern-crate.rs @@ -1,6 +1,5 @@ -// // We specify incremental here because we want to test the partitioning for -//@ incremental compilation +// incremental compilation //@ incremental //@ compile-flags:-Zprint-mono-items=lazy //@ compile-flags:-Zinline-in-all-cgus diff --git a/tests/codegen-units/partitioning/local-drop-glue.rs b/tests/codegen-units/partitioning/local-drop-glue.rs index 0974187ade0dd..0981e4bed1b41 100644 --- a/tests/codegen-units/partitioning/local-drop-glue.rs +++ b/tests/codegen-units/partitioning/local-drop-glue.rs @@ -1,6 +1,5 @@ -// // We specify incremental here because we want to test the partitioning for -//@ incremental compilation +// incremental compilation // We specify opt-level=0 because `drop_in_place` is `Internal` when optimizing //@ incremental //@ compile-flags:-Zprint-mono-items=lazy diff --git a/tests/codegen-units/partitioning/local-generic.rs b/tests/codegen-units/partitioning/local-generic.rs index 2cfdc27ccb149..31f149c7aa5a3 100644 --- a/tests/codegen-units/partitioning/local-generic.rs +++ b/tests/codegen-units/partitioning/local-generic.rs @@ -1,5 +1,5 @@ // We specify incremental here because we want to test the partitioning for -//@ incremental compilation +// incremental compilation //@ incremental //@ compile-flags:-Zprint-mono-items=eager diff --git a/tests/codegen-units/partitioning/local-inlining-but-not-all.rs b/tests/codegen-units/partitioning/local-inlining-but-not-all.rs index 49a2ce7c5d9d4..17652502f561d 100644 --- a/tests/codegen-units/partitioning/local-inlining-but-not-all.rs +++ b/tests/codegen-units/partitioning/local-inlining-but-not-all.rs @@ -1,6 +1,5 @@ -// // We specify incremental here because we want to test the partitioning for -//@ incremental compilation +// incremental compilation //@ incremental //@ compile-flags:-Zprint-mono-items=lazy //@ compile-flags:-Zinline-in-all-cgus=no diff --git a/tests/codegen-units/partitioning/local-inlining.rs b/tests/codegen-units/partitioning/local-inlining.rs index 726cf2b87d268..e4b6423d6490e 100644 --- a/tests/codegen-units/partitioning/local-inlining.rs +++ b/tests/codegen-units/partitioning/local-inlining.rs @@ -1,6 +1,5 @@ -// // We specify incremental here because we want to test the partitioning for -//@ incremental compilation +// incremental compilation //@ incremental //@ compile-flags:-Zprint-mono-items=lazy //@ compile-flags:-Zinline-in-all-cgus diff --git a/tests/codegen-units/partitioning/local-transitive-inlining.rs b/tests/codegen-units/partitioning/local-transitive-inlining.rs index 355eb6cf3954b..91a56f9fbb681 100644 --- a/tests/codegen-units/partitioning/local-transitive-inlining.rs +++ b/tests/codegen-units/partitioning/local-transitive-inlining.rs @@ -1,6 +1,5 @@ -// // We specify incremental here because we want to test the partitioning for -//@ incremental compilation +// incremental compilation //@ incremental //@ compile-flags:-Zprint-mono-items=lazy //@ compile-flags:-Zinline-in-all-cgus diff --git a/tests/codegen-units/partitioning/methods-are-with-self-type.rs b/tests/codegen-units/partitioning/methods-are-with-self-type.rs index 2e54725ff2850..9000e11a68809 100644 --- a/tests/codegen-units/partitioning/methods-are-with-self-type.rs +++ b/tests/codegen-units/partitioning/methods-are-with-self-type.rs @@ -3,9 +3,8 @@ // much sense at the moment. //@ ignore-test -// // We specify incremental here because we want to test the partitioning for -//@ incremental compilation +// incremental compilation //@ incremental //@ compile-flags:-Zprint-mono-items=lazy diff --git a/tests/codegen-units/partitioning/regular-modules.rs b/tests/codegen-units/partitioning/regular-modules.rs index 0eb0848e45446..53bb9cf45e51d 100644 --- a/tests/codegen-units/partitioning/regular-modules.rs +++ b/tests/codegen-units/partitioning/regular-modules.rs @@ -1,5 +1,5 @@ // We specify incremental here because we want to test the partitioning for -//@ incremental compilation +// incremental compilation //@ incremental //@ compile-flags:-Zprint-mono-items=eager diff --git a/tests/codegen-units/partitioning/shared-generics.rs b/tests/codegen-units/partitioning/shared-generics.rs index 25ea7fab7355c..5b78794316c68 100644 --- a/tests/codegen-units/partitioning/shared-generics.rs +++ b/tests/codegen-units/partitioning/shared-generics.rs @@ -1,4 +1,3 @@ -// //@ no-prefer-dynamic // NOTE: We always compile this test with -Copt-level=0 because higher opt-levels // prevent drop-glue from participating in share-generics. diff --git a/tests/codegen-units/partitioning/statics.rs b/tests/codegen-units/partitioning/statics.rs index 9503a91b0ab4b..70a9c123c07f5 100644 --- a/tests/codegen-units/partitioning/statics.rs +++ b/tests/codegen-units/partitioning/statics.rs @@ -1,5 +1,5 @@ // We specify incremental here because we want to test the partitioning for -//@ incremental compilation +// incremental compilation //@ incremental //@ compile-flags:-Zprint-mono-items=lazy diff --git a/tests/codegen-units/partitioning/vtable-through-const.rs b/tests/codegen-units/partitioning/vtable-through-const.rs index 111b4fa1b9ac2..7214b955c3938 100644 --- a/tests/codegen-units/partitioning/vtable-through-const.rs +++ b/tests/codegen-units/partitioning/vtable-through-const.rs @@ -1,7 +1,5 @@ -// - // We specify incremental here because we want to test the partitioning for -//@ incremental compilation +// incremental compilation //@ incremental //@ compile-flags:-Zprint-mono-items=lazy //@ compile-flags:-Zinline-in-all-cgus