From 96e3c2c1acbb711c9b936b558d6a0232a7aca626 Mon Sep 17 00:00:00 2001 From: omahs <73983677+omahs@users.noreply.github.com> Date: Sun, 17 Mar 2024 14:25:06 +0100 Subject: [PATCH 1/5] fix typo --- compiler/rustc_hir_typeck/src/method/probe.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/rustc_hir_typeck/src/method/probe.rs b/compiler/rustc_hir_typeck/src/method/probe.rs index bdc796aca3a46..e4d5ebb82e8c8 100644 --- a/compiler/rustc_hir_typeck/src/method/probe.rs +++ b/compiler/rustc_hir_typeck/src/method/probe.rs @@ -1935,7 +1935,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> { } } - /// Determine if the associated item withe the given DefId matches + /// Determine if the associated item with the given DefId matches /// the desired name via a doc alias. fn matches_by_doc_alias(&self, def_id: DefId) -> bool { let Some(name) = self.method_name else { From 758f642c29043630fd987afd74b008fa9c49a51d Mon Sep 17 00:00:00 2001 From: omahs <73983677+omahs@users.noreply.github.com> Date: Sun, 17 Mar 2024 14:25:24 +0100 Subject: [PATCH 2/5] fix typo --- compiler/rustc_mir_build/src/build/scope.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler/rustc_mir_build/src/build/scope.rs b/compiler/rustc_mir_build/src/build/scope.rs index 88ac05cabb659..aef63896dde1e 100644 --- a/compiler/rustc_mir_build/src/build/scope.rs +++ b/compiler/rustc_mir_build/src/build/scope.rs @@ -774,7 +774,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> { let (current_root, parent_root) = if self.tcx.sess.opts.unstable_opts.maximal_hir_to_mir_coverage { // Some consumers of rustc need to map MIR locations back to HIR nodes. Currently - // the the only part of rustc that tracks MIR -> HIR is the + // the only part of rustc that tracks MIR -> HIR is the // `SourceScopeLocalData::lint_root` field that tracks lint levels for MIR // locations. Normally the number of source scopes is limited to the set of nodes // with lint annotations. The -Zmaximal-hir-to-mir-coverage flag changes this From 872781b22697882051481a4ed7c764551a8b2cf2 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 17 Mar 2024 19:32:03 +0100 Subject: [PATCH 3/5] interpret/memory: explain why we use == on bool --- compiler/rustc_const_eval/src/interpret/memory.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler/rustc_const_eval/src/interpret/memory.rs b/compiler/rustc_const_eval/src/interpret/memory.rs index 86aad2e1642d6..a6ca4b2e0de43 100644 --- a/compiler/rustc_const_eval/src/interpret/memory.rs +++ b/compiler/rustc_const_eval/src/interpret/memory.rs @@ -949,6 +949,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { /// Runs the close in "validation" mode, which means the machine's memory read hooks will be /// suppressed. Needless to say, this must only be set with great care! Cannot be nested. pub(super) fn run_for_validation(&self, f: impl FnOnce() -> R) -> R { + // This deliberately uses `==` on `bool` to follow the pattern + // `assert!(val.replace(new) == old)`. assert!( self.memory.validation_in_progress.replace(true) == false, "`validation_in_progress` was already set" From 23a4ad12ce047a8e175f1298000553435ab835a0 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 17 Mar 2024 19:36:55 +0100 Subject: [PATCH 4/5] simplify_cfg: rename some passes so that they make more sense --- compiler/rustc_mir_transform/src/lib.rs | 4 ++-- compiler/rustc_mir_transform/src/simplify.rs | 11 +++++++---- ...mplifyCfg-pre-optimizations.after.panic-abort.mir} | 2 +- ...plifyCfg-pre-optimizations.after.panic-unwind.mir} | 2 +- tests/mir-opt/array_index_is_temporary.rs | 4 ++-- ...lice.main.SimplifyCfg-pre-optimizations.after.mir} | 2 +- tests/mir-opt/byte_slice.rs | 2 +- ...omoted[0].SimplifyCfg-pre-optimizations.after.mir} | 2 +- ...omoted[0].SimplifyCfg-pre-optimizations.after.mir} | 2 +- tests/mir-opt/const_promotion_extern_static.rs | 4 ++-- tests/mir-opt/no_drop_for_inactive_variant.rs | 2 +- ...mplifyCfg-pre-optimizations.after.panic-abort.mir} | 2 +- ...plifyCfg-pre-optimizations.after.panic-unwind.mir} | 2 +- ...mplifyCfg-pre-optimizations.after.panic-abort.mir} | 2 +- ...plifyCfg-pre-optimizations.after.panic-unwind.mir} | 2 +- tests/mir-opt/packed_struct_drop_aligned.rs | 2 +- ...mplifyCfg-pre-optimizations.after.panic-abort.mir} | 2 +- ...plifyCfg-pre-optimizations.after.panic-unwind.mir} | 2 +- ...mplifyCfg-pre-optimizations.after.panic-abort.mir} | 2 +- ...plifyCfg-pre-optimizations.after.panic-unwind.mir} | 2 +- ...mplifyCfg-pre-optimizations.after.panic-abort.mir} | 2 +- ...plifyCfg-pre-optimizations.after.panic-unwind.mir} | 2 +- tests/mir-opt/retag.rs | 10 +++++----- ...mplifyCfg-pre-optimizations.after.panic-abort.mir} | 2 +- ...plifyCfg-pre-optimizations.after.panic-unwind.mir} | 2 +- ...mplifyCfg-pre-optimizations.after.panic-abort.mir} | 2 +- ...plifyCfg-pre-optimizations.after.panic-unwind.mir} | 2 +- ... simplify_cfg.main.SimplifyCfg-post-analysis.diff} | 4 ++-- tests/mir-opt/simplify_cfg.rs | 2 +- 29 files changed, 43 insertions(+), 40 deletions(-) rename tests/mir-opt/{array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.panic-abort.mir => array_index_is_temporary.main.SimplifyCfg-pre-optimizations.after.panic-abort.mir} (96%) rename tests/mir-opt/{array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.panic-unwind.mir => array_index_is_temporary.main.SimplifyCfg-pre-optimizations.after.panic-unwind.mir} (96%) rename tests/mir-opt/{byte_slice.main.SimplifyCfg-elaborate-drops.after.mir => byte_slice.main.SimplifyCfg-pre-optimizations.after.mir} (90%) rename tests/mir-opt/{const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-elaborate-drops.after.mir => const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-pre-optimizations.after.mir} (85%) rename tests/mir-opt/{const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-elaborate-drops.after.mir => const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-pre-optimizations.after.mir} (82%) rename tests/mir-opt/{no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.panic-abort.mir => no_drop_for_inactive_variant.unwrap.SimplifyCfg-pre-optimizations.after.panic-abort.mir} (92%) rename tests/mir-opt/{no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.panic-unwind.mir => no_drop_for_inactive_variant.unwrap.SimplifyCfg-pre-optimizations.after.panic-unwind.mir} (93%) rename tests/mir-opt/{packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.panic-abort.mir => packed_struct_drop_aligned.main.SimplifyCfg-pre-optimizations.after.panic-abort.mir} (94%) rename tests/mir-opt/{packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.panic-unwind.mir => packed_struct_drop_aligned.main.SimplifyCfg-pre-optimizations.after.panic-unwind.mir} (95%) rename tests/mir-opt/{retag.array_casts.SimplifyCfg-elaborate-drops.after.panic-abort.mir => retag.array_casts.SimplifyCfg-pre-optimizations.after.panic-abort.mir} (98%) rename tests/mir-opt/{retag.array_casts.SimplifyCfg-elaborate-drops.after.panic-unwind.mir => retag.array_casts.SimplifyCfg-pre-optimizations.after.panic-unwind.mir} (98%) rename tests/mir-opt/{retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.panic-unwind.mir => retag.main-{closure#0}.SimplifyCfg-pre-optimizations.after.panic-abort.mir} (85%) rename tests/mir-opt/{retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.panic-abort.mir => retag.main-{closure#0}.SimplifyCfg-pre-optimizations.after.panic-unwind.mir} (85%) rename tests/mir-opt/{retag.main.SimplifyCfg-elaborate-drops.after.panic-abort.mir => retag.main.SimplifyCfg-pre-optimizations.after.panic-abort.mir} (98%) rename tests/mir-opt/{retag.main.SimplifyCfg-elaborate-drops.after.panic-unwind.mir => retag.main.SimplifyCfg-pre-optimizations.after.panic-unwind.mir} (98%) rename tests/mir-opt/{retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.panic-unwind.mir => retag.{impl#0}-foo.SimplifyCfg-pre-optimizations.after.panic-abort.mir} (94%) rename tests/mir-opt/{retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.panic-abort.mir => retag.{impl#0}-foo.SimplifyCfg-pre-optimizations.after.panic-unwind.mir} (94%) rename tests/mir-opt/{retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.panic-abort.mir => retag.{impl#0}-foo_shr.SimplifyCfg-pre-optimizations.after.panic-abort.mir} (91%) rename tests/mir-opt/{retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.panic-unwind.mir => retag.{impl#0}-foo_shr.SimplifyCfg-pre-optimizations.after.panic-unwind.mir} (91%) rename tests/mir-opt/{simplify_cfg.main.SimplifyCfg-early-opt.diff => simplify_cfg.main.SimplifyCfg-post-analysis.diff} (88%) diff --git a/compiler/rustc_mir_transform/src/lib.rs b/compiler/rustc_mir_transform/src/lib.rs index 4551380152217..3e5ec323d2746 100644 --- a/compiler/rustc_mir_transform/src/lib.rs +++ b/compiler/rustc_mir_transform/src/lib.rs @@ -507,7 +507,7 @@ fn run_analysis_cleanup_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) { let passes: &[&dyn MirPass<'tcx>] = &[ &cleanup_post_borrowck::CleanupPostBorrowck, &remove_noop_landing_pads::RemoveNoopLandingPads, - &simplify::SimplifyCfg::EarlyOpt, + &simplify::SimplifyCfg::PostAnalysis, &deref_separator::Derefer, ]; @@ -544,7 +544,7 @@ fn run_runtime_cleanup_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) { let passes: &[&dyn MirPass<'tcx>] = &[ &lower_intrinsics::LowerIntrinsics, &remove_place_mention::RemovePlaceMention, - &simplify::SimplifyCfg::ElaborateDrops, + &simplify::SimplifyCfg::PreOptimizations, ]; pm::run_passes(tcx, body, passes, Some(MirPhase::Runtime(RuntimePhase::PostCleanup))); diff --git a/compiler/rustc_mir_transform/src/simplify.rs b/compiler/rustc_mir_transform/src/simplify.rs index 8c8818bd68e6f..574330cc355c4 100644 --- a/compiler/rustc_mir_transform/src/simplify.rs +++ b/compiler/rustc_mir_transform/src/simplify.rs @@ -37,8 +37,11 @@ pub enum SimplifyCfg { Initial, PromoteConsts, RemoveFalseEdges, - EarlyOpt, - ElaborateDrops, + /// Runs at the beginning of "analysis to runtime" lowering, *before* drop elaboration. + PostAnalysis, + /// Runs at the end of "analysis to runtime" lowering, *after* drop elaboration. + /// This is before the main optimization passes on runtime MIR kick in. + PreOptimizations, Final, MakeShim, AfterUninhabitedEnumBranching, @@ -50,8 +53,8 @@ impl SimplifyCfg { SimplifyCfg::Initial => "SimplifyCfg-initial", SimplifyCfg::PromoteConsts => "SimplifyCfg-promote-consts", SimplifyCfg::RemoveFalseEdges => "SimplifyCfg-remove-false-edges", - SimplifyCfg::EarlyOpt => "SimplifyCfg-early-opt", - SimplifyCfg::ElaborateDrops => "SimplifyCfg-elaborate-drops", + SimplifyCfg::PostAnalysis => "SimplifyCfg-post-analysis", + SimplifyCfg::PreOptimizations => "SimplifyCfg-pre-optimizations", SimplifyCfg::Final => "SimplifyCfg-final", SimplifyCfg::MakeShim => "SimplifyCfg-make_shim", SimplifyCfg::AfterUninhabitedEnumBranching => { diff --git a/tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.panic-abort.mir b/tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-pre-optimizations.after.panic-abort.mir similarity index 96% rename from tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.panic-abort.mir rename to tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-pre-optimizations.after.panic-abort.mir index 9b4c221df73d3..3b7c4b8796ea0 100644 --- a/tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.panic-abort.mir +++ b/tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-pre-optimizations.after.panic-abort.mir @@ -1,4 +1,4 @@ -// MIR for `main` after SimplifyCfg-elaborate-drops +// MIR for `main` after SimplifyCfg-pre-optimizations fn main() -> () { let mut _0: (); diff --git a/tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.panic-unwind.mir b/tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-pre-optimizations.after.panic-unwind.mir similarity index 96% rename from tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.panic-unwind.mir rename to tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-pre-optimizations.after.panic-unwind.mir index 4b05610f73105..3dcddea0353f2 100644 --- a/tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.panic-unwind.mir +++ b/tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-pre-optimizations.after.panic-unwind.mir @@ -1,4 +1,4 @@ -// MIR for `main` after SimplifyCfg-elaborate-drops +// MIR for `main` after SimplifyCfg-pre-optimizations fn main() -> () { let mut _0: (); diff --git a/tests/mir-opt/array_index_is_temporary.rs b/tests/mir-opt/array_index_is_temporary.rs index 3e5d5d5dd27f8..500b8b7f7c74e 100644 --- a/tests/mir-opt/array_index_is_temporary.rs +++ b/tests/mir-opt/array_index_is_temporary.rs @@ -1,4 +1,4 @@ -//@ unit-test: SimplifyCfg-elaborate-drops +//@ unit-test: SimplifyCfg-pre-optimizations // EMIT_MIR_FOR_EACH_PANIC_STRATEGY // Retagging (from Stacked Borrows) relies on the array index being a fresh // temporary, so that side-effects cannot change it. @@ -10,7 +10,7 @@ unsafe fn foo(z: *mut usize) -> u32 { } -// EMIT_MIR array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir +// EMIT_MIR array_index_is_temporary.main.SimplifyCfg-pre-optimizations.after.mir fn main() { // CHECK-LABEL: fn main( // CHECK: debug x => [[x:_.*]]; diff --git a/tests/mir-opt/byte_slice.main.SimplifyCfg-elaborate-drops.after.mir b/tests/mir-opt/byte_slice.main.SimplifyCfg-pre-optimizations.after.mir similarity index 90% rename from tests/mir-opt/byte_slice.main.SimplifyCfg-elaborate-drops.after.mir rename to tests/mir-opt/byte_slice.main.SimplifyCfg-pre-optimizations.after.mir index 09a65e6e6a6ea..c53b5e48610f6 100644 --- a/tests/mir-opt/byte_slice.main.SimplifyCfg-elaborate-drops.after.mir +++ b/tests/mir-opt/byte_slice.main.SimplifyCfg-pre-optimizations.after.mir @@ -1,4 +1,4 @@ -// MIR for `main` after SimplifyCfg-elaborate-drops +// MIR for `main` after SimplifyCfg-pre-optimizations fn main() -> () { let mut _0: (); diff --git a/tests/mir-opt/byte_slice.rs b/tests/mir-opt/byte_slice.rs index c064e2945fd22..fa616b62ad0b2 100644 --- a/tests/mir-opt/byte_slice.rs +++ b/tests/mir-opt/byte_slice.rs @@ -1,7 +1,7 @@ // skip-filecheck //@ compile-flags: -Z mir-opt-level=0 -// EMIT_MIR byte_slice.main.SimplifyCfg-elaborate-drops.after.mir +// EMIT_MIR byte_slice.main.SimplifyCfg-pre-optimizations.after.mir fn main() { let x = b"foo"; let y = [5u8, b'x']; diff --git a/tests/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-elaborate-drops.after.mir b/tests/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-pre-optimizations.after.mir similarity index 85% rename from tests/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-elaborate-drops.after.mir rename to tests/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-pre-optimizations.after.mir index b4ae8386add3d..7affbf6dd403f 100644 --- a/tests/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-elaborate-drops.after.mir +++ b/tests/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-pre-optimizations.after.mir @@ -1,4 +1,4 @@ -// MIR for `BAR::promoted[0]` after SimplifyCfg-elaborate-drops +// MIR for `BAR::promoted[0]` after SimplifyCfg-pre-optimizations const BAR::promoted[0]: &[&i32; 1] = { let mut _0: &[&i32; 1]; diff --git a/tests/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-elaborate-drops.after.mir b/tests/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-pre-optimizations.after.mir similarity index 82% rename from tests/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-elaborate-drops.after.mir rename to tests/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-pre-optimizations.after.mir index 8d4bfa711e414..72cb64e275e36 100644 --- a/tests/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-elaborate-drops.after.mir +++ b/tests/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-pre-optimizations.after.mir @@ -1,4 +1,4 @@ -// MIR for `FOO::promoted[0]` after SimplifyCfg-elaborate-drops +// MIR for `FOO::promoted[0]` after SimplifyCfg-pre-optimizations const FOO::promoted[0]: &[&i32; 1] = { let mut _0: &[&i32; 1]; diff --git a/tests/mir-opt/const_promotion_extern_static.rs b/tests/mir-opt/const_promotion_extern_static.rs index 077e74e91f43f..fe258f5e8fdb3 100644 --- a/tests/mir-opt/const_promotion_extern_static.rs +++ b/tests/mir-opt/const_promotion_extern_static.rs @@ -6,11 +6,11 @@ extern "C" { static Y: i32 = 42; // EMIT_MIR const_promotion_extern_static.BAR.PromoteTemps.diff -// EMIT_MIR const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-elaborate-drops.after.mir +// EMIT_MIR const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-pre-optimizations.after.mir static mut BAR: *const &i32 = [&Y].as_ptr(); // EMIT_MIR const_promotion_extern_static.FOO.PromoteTemps.diff -// EMIT_MIR const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-elaborate-drops.after.mir +// EMIT_MIR const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-pre-optimizations.after.mir static mut FOO: *const &i32 = [unsafe { &X }].as_ptr(); // EMIT_MIR const_promotion_extern_static.BOP.built.after.mir diff --git a/tests/mir-opt/no_drop_for_inactive_variant.rs b/tests/mir-opt/no_drop_for_inactive_variant.rs index dd20e4a548eb1..c94b36971ca2e 100644 --- a/tests/mir-opt/no_drop_for_inactive_variant.rs +++ b/tests/mir-opt/no_drop_for_inactive_variant.rs @@ -4,7 +4,7 @@ // Ensure that there are no drop terminators in `unwrap` (except the one along the cleanup // path). -// EMIT_MIR no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.mir +// EMIT_MIR no_drop_for_inactive_variant.unwrap.SimplifyCfg-pre-optimizations.after.mir fn unwrap(opt: Option) -> T { match opt { Some(x) => x, diff --git a/tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.panic-abort.mir b/tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-pre-optimizations.after.panic-abort.mir similarity index 92% rename from tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.panic-abort.mir rename to tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-pre-optimizations.after.panic-abort.mir index 31a6a1d8b3daa..fa6c6ce8e5750 100644 --- a/tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.panic-abort.mir +++ b/tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-pre-optimizations.after.panic-abort.mir @@ -1,4 +1,4 @@ -// MIR for `unwrap` after SimplifyCfg-elaborate-drops +// MIR for `unwrap` after SimplifyCfg-pre-optimizations fn unwrap(_1: Option) -> T { debug opt => _1; diff --git a/tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.panic-unwind.mir b/tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-pre-optimizations.after.panic-unwind.mir similarity index 93% rename from tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.panic-unwind.mir rename to tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-pre-optimizations.after.panic-unwind.mir index 53352fbb19f4c..54fec3c0f9847 100644 --- a/tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.panic-unwind.mir +++ b/tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-pre-optimizations.after.panic-unwind.mir @@ -1,4 +1,4 @@ -// MIR for `unwrap` after SimplifyCfg-elaborate-drops +// MIR for `unwrap` after SimplifyCfg-pre-optimizations fn unwrap(_1: Option) -> T { debug opt => _1; diff --git a/tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.panic-abort.mir b/tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-pre-optimizations.after.panic-abort.mir similarity index 94% rename from tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.panic-abort.mir rename to tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-pre-optimizations.after.panic-abort.mir index 089adff0c565e..57f3c614afa5e 100644 --- a/tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.panic-abort.mir +++ b/tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-pre-optimizations.after.panic-abort.mir @@ -1,4 +1,4 @@ -// MIR for `main` after SimplifyCfg-elaborate-drops +// MIR for `main` after SimplifyCfg-pre-optimizations fn main() -> () { let mut _0: (); diff --git a/tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.panic-unwind.mir b/tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-pre-optimizations.after.panic-unwind.mir similarity index 95% rename from tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.panic-unwind.mir rename to tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-pre-optimizations.after.panic-unwind.mir index 0ef19180459dc..d5d466a1c30a5 100644 --- a/tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.panic-unwind.mir +++ b/tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-pre-optimizations.after.panic-unwind.mir @@ -1,4 +1,4 @@ -// MIR for `main` after SimplifyCfg-elaborate-drops +// MIR for `main` after SimplifyCfg-pre-optimizations fn main() -> () { let mut _0: (); diff --git a/tests/mir-opt/packed_struct_drop_aligned.rs b/tests/mir-opt/packed_struct_drop_aligned.rs index 079c4e68f50ca..dff941c4fa0c0 100644 --- a/tests/mir-opt/packed_struct_drop_aligned.rs +++ b/tests/mir-opt/packed_struct_drop_aligned.rs @@ -2,7 +2,7 @@ // EMIT_MIR_FOR_EACH_PANIC_STRATEGY -// EMIT_MIR packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir +// EMIT_MIR packed_struct_drop_aligned.main.SimplifyCfg-pre-optimizations.after.mir fn main() { let mut x = Packed(Aligned(Droppy(0))); x.0 = Aligned(Droppy(0)); diff --git a/tests/mir-opt/retag.array_casts.SimplifyCfg-elaborate-drops.after.panic-abort.mir b/tests/mir-opt/retag.array_casts.SimplifyCfg-pre-optimizations.after.panic-abort.mir similarity index 98% rename from tests/mir-opt/retag.array_casts.SimplifyCfg-elaborate-drops.after.panic-abort.mir rename to tests/mir-opt/retag.array_casts.SimplifyCfg-pre-optimizations.after.panic-abort.mir index 0580bf3e2d0fa..7124b4c1cd873 100644 --- a/tests/mir-opt/retag.array_casts.SimplifyCfg-elaborate-drops.after.panic-abort.mir +++ b/tests/mir-opt/retag.array_casts.SimplifyCfg-pre-optimizations.after.panic-abort.mir @@ -1,4 +1,4 @@ -// MIR for `array_casts` after SimplifyCfg-elaborate-drops +// MIR for `array_casts` after SimplifyCfg-pre-optimizations fn array_casts() -> () { let mut _0: (); diff --git a/tests/mir-opt/retag.array_casts.SimplifyCfg-elaborate-drops.after.panic-unwind.mir b/tests/mir-opt/retag.array_casts.SimplifyCfg-pre-optimizations.after.panic-unwind.mir similarity index 98% rename from tests/mir-opt/retag.array_casts.SimplifyCfg-elaborate-drops.after.panic-unwind.mir rename to tests/mir-opt/retag.array_casts.SimplifyCfg-pre-optimizations.after.panic-unwind.mir index 6f3cc9051d340..be04757f2a3cd 100644 --- a/tests/mir-opt/retag.array_casts.SimplifyCfg-elaborate-drops.after.panic-unwind.mir +++ b/tests/mir-opt/retag.array_casts.SimplifyCfg-pre-optimizations.after.panic-unwind.mir @@ -1,4 +1,4 @@ -// MIR for `array_casts` after SimplifyCfg-elaborate-drops +// MIR for `array_casts` after SimplifyCfg-pre-optimizations fn array_casts() -> () { let mut _0: (); diff --git a/tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.panic-unwind.mir b/tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-pre-optimizations.after.panic-abort.mir similarity index 85% rename from tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.panic-unwind.mir rename to tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-pre-optimizations.after.panic-abort.mir index 7f3310919cade..2620929e896be 100644 --- a/tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.panic-unwind.mir +++ b/tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-pre-optimizations.after.panic-abort.mir @@ -1,4 +1,4 @@ -// MIR for `main::{closure#0}` after SimplifyCfg-elaborate-drops +// MIR for `main::{closure#0}` after SimplifyCfg-pre-optimizations fn main::{closure#0}(_1: &{closure@main::{closure#0}}, _2: &i32) -> &i32 { debug x => _2; diff --git a/tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.panic-abort.mir b/tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-pre-optimizations.after.panic-unwind.mir similarity index 85% rename from tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.panic-abort.mir rename to tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-pre-optimizations.after.panic-unwind.mir index 7f3310919cade..2620929e896be 100644 --- a/tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.panic-abort.mir +++ b/tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-pre-optimizations.after.panic-unwind.mir @@ -1,4 +1,4 @@ -// MIR for `main::{closure#0}` after SimplifyCfg-elaborate-drops +// MIR for `main::{closure#0}` after SimplifyCfg-pre-optimizations fn main::{closure#0}(_1: &{closure@main::{closure#0}}, _2: &i32) -> &i32 { debug x => _2; diff --git a/tests/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.panic-abort.mir b/tests/mir-opt/retag.main.SimplifyCfg-pre-optimizations.after.panic-abort.mir similarity index 98% rename from tests/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.panic-abort.mir rename to tests/mir-opt/retag.main.SimplifyCfg-pre-optimizations.after.panic-abort.mir index 96a76cc66abd6..d7372a0508254 100644 --- a/tests/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.panic-abort.mir +++ b/tests/mir-opt/retag.main.SimplifyCfg-pre-optimizations.after.panic-abort.mir @@ -1,4 +1,4 @@ -// MIR for `main` after SimplifyCfg-elaborate-drops +// MIR for `main` after SimplifyCfg-pre-optimizations fn main() -> () { let mut _0: (); diff --git a/tests/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.panic-unwind.mir b/tests/mir-opt/retag.main.SimplifyCfg-pre-optimizations.after.panic-unwind.mir similarity index 98% rename from tests/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.panic-unwind.mir rename to tests/mir-opt/retag.main.SimplifyCfg-pre-optimizations.after.panic-unwind.mir index 2cedf4c3f5f91..6ec62bfcf8ccb 100644 --- a/tests/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.panic-unwind.mir +++ b/tests/mir-opt/retag.main.SimplifyCfg-pre-optimizations.after.panic-unwind.mir @@ -1,4 +1,4 @@ -// MIR for `main` after SimplifyCfg-elaborate-drops +// MIR for `main` after SimplifyCfg-pre-optimizations fn main() -> () { let mut _0: (); diff --git a/tests/mir-opt/retag.rs b/tests/mir-opt/retag.rs index 0f2659ebfe853..9cee96e429498 100644 --- a/tests/mir-opt/retag.rs +++ b/tests/mir-opt/retag.rs @@ -8,8 +8,8 @@ struct Test(i32); -// EMIT_MIR retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.mir -// EMIT_MIR retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.mir +// EMIT_MIR retag.{impl#0}-foo.SimplifyCfg-pre-optimizations.after.mir +// EMIT_MIR retag.{impl#0}-foo_shr.SimplifyCfg-pre-optimizations.after.mir impl Test { // Make sure we run the pass on a method, not just on bare functions. fn foo<'x>(&self, x: &'x mut i32) -> &'x mut i32 { @@ -26,8 +26,8 @@ impl Drop for Test { fn drop(&mut self) {} } -// EMIT_MIR retag.main.SimplifyCfg-elaborate-drops.after.mir -// EMIT_MIR retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.mir +// EMIT_MIR retag.main.SimplifyCfg-pre-optimizations.after.mir +// EMIT_MIR retag.main-{closure#0}.SimplifyCfg-pre-optimizations.after.mir pub fn main() { let mut x = 0; { @@ -55,7 +55,7 @@ pub fn main() { } /// Casting directly to an array should also go through `&raw` and thus add appropriate retags. -// EMIT_MIR retag.array_casts.SimplifyCfg-elaborate-drops.after.mir +// EMIT_MIR retag.array_casts.SimplifyCfg-pre-optimizations.after.mir fn array_casts() { let mut x: [usize; 2] = [0, 0]; let p = &mut x as *mut usize; diff --git a/tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.panic-unwind.mir b/tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-pre-optimizations.after.panic-abort.mir similarity index 94% rename from tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.panic-unwind.mir rename to tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-pre-optimizations.after.panic-abort.mir index 285db435f5a0a..b656656919e1f 100644 --- a/tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.panic-unwind.mir +++ b/tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-pre-optimizations.after.panic-abort.mir @@ -1,4 +1,4 @@ -// MIR for `::foo` after SimplifyCfg-elaborate-drops +// MIR for `::foo` after SimplifyCfg-pre-optimizations fn ::foo(_1: &Test, _2: &mut i32) -> &mut i32 { debug self => _1; diff --git a/tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.panic-abort.mir b/tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-pre-optimizations.after.panic-unwind.mir similarity index 94% rename from tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.panic-abort.mir rename to tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-pre-optimizations.after.panic-unwind.mir index 285db435f5a0a..b656656919e1f 100644 --- a/tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.panic-abort.mir +++ b/tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-pre-optimizations.after.panic-unwind.mir @@ -1,4 +1,4 @@ -// MIR for `::foo` after SimplifyCfg-elaborate-drops +// MIR for `::foo` after SimplifyCfg-pre-optimizations fn ::foo(_1: &Test, _2: &mut i32) -> &mut i32 { debug self => _1; diff --git a/tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.panic-abort.mir b/tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-pre-optimizations.after.panic-abort.mir similarity index 91% rename from tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.panic-abort.mir rename to tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-pre-optimizations.after.panic-abort.mir index 9ad607b2fe291..4f90413e38bfe 100644 --- a/tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.panic-abort.mir +++ b/tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-pre-optimizations.after.panic-abort.mir @@ -1,4 +1,4 @@ -// MIR for `::foo_shr` after SimplifyCfg-elaborate-drops +// MIR for `::foo_shr` after SimplifyCfg-pre-optimizations fn ::foo_shr(_1: &Test, _2: &i32) -> &i32 { debug self => _1; diff --git a/tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.panic-unwind.mir b/tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-pre-optimizations.after.panic-unwind.mir similarity index 91% rename from tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.panic-unwind.mir rename to tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-pre-optimizations.after.panic-unwind.mir index 9ad607b2fe291..4f90413e38bfe 100644 --- a/tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.panic-unwind.mir +++ b/tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-pre-optimizations.after.panic-unwind.mir @@ -1,4 +1,4 @@ -// MIR for `::foo_shr` after SimplifyCfg-elaborate-drops +// MIR for `::foo_shr` after SimplifyCfg-pre-optimizations fn ::foo_shr(_1: &Test, _2: &i32) -> &i32 { debug self => _1; diff --git a/tests/mir-opt/simplify_cfg.main.SimplifyCfg-early-opt.diff b/tests/mir-opt/simplify_cfg.main.SimplifyCfg-post-analysis.diff similarity index 88% rename from tests/mir-opt/simplify_cfg.main.SimplifyCfg-early-opt.diff rename to tests/mir-opt/simplify_cfg.main.SimplifyCfg-post-analysis.diff index f20ab869b7bcc..0e41950d6267d 100644 --- a/tests/mir-opt/simplify_cfg.main.SimplifyCfg-early-opt.diff +++ b/tests/mir-opt/simplify_cfg.main.SimplifyCfg-post-analysis.diff @@ -1,5 +1,5 @@ -- // MIR for `main` before SimplifyCfg-early-opt -+ // MIR for `main` after SimplifyCfg-early-opt +- // MIR for `main` before SimplifyCfg-post-analysis ++ // MIR for `main` after SimplifyCfg-post-analysis fn main() -> () { let mut _0: (); diff --git a/tests/mir-opt/simplify_cfg.rs b/tests/mir-opt/simplify_cfg.rs index 8dea0e50a61bb..b1fdc5e64a0e2 100644 --- a/tests/mir-opt/simplify_cfg.rs +++ b/tests/mir-opt/simplify_cfg.rs @@ -4,7 +4,7 @@ //@ no-prefer-dynamic // EMIT_MIR simplify_cfg.main.SimplifyCfg-initial.diff -// EMIT_MIR simplify_cfg.main.SimplifyCfg-early-opt.diff +// EMIT_MIR simplify_cfg.main.SimplifyCfg-post-analysis.diff fn main() { loop { if bar() { From 36514015ffc58ede3995e96dc0b057fc8a32de0b Mon Sep 17 00:00:00 2001 From: beetrees Date: Sun, 17 Mar 2024 19:04:42 +0000 Subject: [PATCH 5/5] Move `option_env!` and `env!` tests to the `env-macro` directory --- src/tools/tidy/src/issues.txt | 2 -- src/tools/tidy/src/ui_tests.rs | 2 +- .../env-arg-2-not-string-literal.rs} | 0 .../env-arg-2-not-string-literal.stderr} | 2 +- .../env-env-overload.rs} | 0 tests/ui/{extenv/extenv-env.rs => env-macro/env-env.rs} | 0 .../env-escaped-var.rs} | 0 .../env-escaped-var.stderr} | 2 +- .../extenv-no-args.rs => env-macro/env-no-args.rs} | 0 .../env-no-args.stderr} | 2 +- .../env-not-defined-custom.rs} | 0 .../env-not-defined-custom.stderr} | 2 +- .../env-not-defined-default.rs} | 0 .../env-not-defined-default.stderr} | 2 +- .../extenv-not-env.rs => env-macro/env-not-env.rs} | 0 .../env-not-string-literal.rs} | 0 .../env-not-string-literal.stderr} | 2 +- .../env-too-many-args.rs} | 0 .../env-too-many-args.stderr} | 2 +- .../error-recovery-issue-55897.rs} | 0 .../error-recovery-issue-55897.stderr} | 8 ++++---- .../name-whitespace-issue-110547.rs} | 0 .../name-whitespace-issue-110547.stderr} | 6 +++--- .../option_env-no-args.rs} | 0 .../option_env-no-args.stderr} | 2 +- .../option_env-not-defined.rs} | 0 .../option_env-not-string-literal.rs} | 0 .../option_env-not-string-literal.stderr} | 2 +- .../option_env-too-many-args.rs} | 0 .../option_env-too-many-args.stderr} | 2 +- 30 files changed, 18 insertions(+), 20 deletions(-) rename tests/ui/{extenv/extenv-arg-2-not-string-literal.rs => env-macro/env-arg-2-not-string-literal.rs} (100%) rename tests/ui/{extenv/extenv-arg-2-not-string-literal.stderr => env-macro/env-arg-2-not-string-literal.stderr} (74%) rename tests/ui/{extenv/extenv-env-overload.rs => env-macro/env-env-overload.rs} (100%) rename tests/ui/{extenv/extenv-env.rs => env-macro/env-env.rs} (100%) rename tests/ui/{extenv/extenv-escaped-var.rs => env-macro/env-escaped-var.rs} (100%) rename tests/ui/{extenv/extenv-escaped-var.stderr => env-macro/env-escaped-var.stderr} (90%) rename tests/ui/{extenv/extenv-no-args.rs => env-macro/env-no-args.rs} (100%) rename tests/ui/{extenv/extenv-no-args.stderr => env-macro/env-no-args.stderr} (80%) rename tests/ui/{extenv/extenv-not-defined-custom.rs => env-macro/env-not-defined-custom.rs} (100%) rename tests/ui/{extenv/extenv-not-defined-custom.stderr => env-macro/env-not-defined-custom.stderr} (88%) rename tests/ui/{extenv/extenv-not-defined-default.rs => env-macro/env-not-defined-default.rs} (100%) rename tests/ui/{extenv/extenv-not-defined-default.stderr => env-macro/env-not-defined-default.stderr} (91%) rename tests/ui/{extenv/extenv-not-env.rs => env-macro/env-not-env.rs} (100%) rename tests/ui/{extenv/extenv-not-string-literal.rs => env-macro/env-not-string-literal.rs} (100%) rename tests/ui/{extenv/extenv-not-string-literal.stderr => env-macro/env-not-string-literal.stderr} (75%) rename tests/ui/{extenv/extenv-too-many-args.rs => env-macro/env-too-many-args.rs} (100%) rename tests/ui/{extenv/extenv-too-many-args.stderr => env-macro/env-too-many-args.stderr} (81%) rename tests/ui/{extenv/issue-55897.rs => env-macro/error-recovery-issue-55897.rs} (100%) rename tests/ui/{extenv/issue-55897.stderr => env-macro/error-recovery-issue-55897.stderr} (85%) rename tests/ui/{extenv/issue-110547.rs => env-macro/name-whitespace-issue-110547.rs} (100%) rename tests/ui/{extenv/issue-110547.stderr => env-macro/name-whitespace-issue-110547.stderr} (87%) rename tests/ui/{extoption_env-no-args.rs => env-macro/option_env-no-args.rs} (100%) rename tests/ui/{extoption_env-no-args.stderr => env-macro/option_env-no-args.stderr} (78%) rename tests/ui/{extoption_env-not-defined.rs => env-macro/option_env-not-defined.rs} (100%) rename tests/ui/{extoption_env-not-string-literal.rs => env-macro/option_env-not-string-literal.rs} (100%) rename tests/ui/{extoption_env-not-string-literal.stderr => env-macro/option_env-not-string-literal.stderr} (75%) rename tests/ui/{extoption_env-too-many-args.rs => env-macro/option_env-too-many-args.rs} (100%) rename tests/ui/{extoption_env-too-many-args.stderr => env-macro/option_env-too-many-args.stderr} (78%) diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt index 0ef962c2df870..03e4ecca9d6fd 100644 --- a/src/tools/tidy/src/issues.txt +++ b/src/tools/tidy/src/issues.txt @@ -968,8 +968,6 @@ "ui/errors/issue-89280-emitter-overflow-splice-lines.rs", "ui/errors/issue-99572-impl-trait-on-pointer.rs", "ui/expr/if/issue-4201.rs", -"ui/extenv/issue-110547.rs", -"ui/extenv/issue-55897.rs", "ui/extern/auxiliary/issue-80074-macro-2.rs", "ui/extern/auxiliary/issue-80074-macro.rs", "ui/extern/issue-10025.rs", diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs index c946554b98ff6..22927cffd1b9b 100644 --- a/src/tools/tidy/src/ui_tests.rs +++ b/src/tools/tidy/src/ui_tests.rs @@ -18,7 +18,7 @@ const ENTRY_LIMIT: usize = 900; // FIXME: The following limits should be reduced eventually. const ISSUES_ENTRY_LIMIT: usize = 1750; -const ROOT_ENTRY_LIMIT: usize = 866; +const ROOT_ENTRY_LIMIT: usize = 859; const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[ "rs", // test source files diff --git a/tests/ui/extenv/extenv-arg-2-not-string-literal.rs b/tests/ui/env-macro/env-arg-2-not-string-literal.rs similarity index 100% rename from tests/ui/extenv/extenv-arg-2-not-string-literal.rs rename to tests/ui/env-macro/env-arg-2-not-string-literal.rs diff --git a/tests/ui/extenv/extenv-arg-2-not-string-literal.stderr b/tests/ui/env-macro/env-arg-2-not-string-literal.stderr similarity index 74% rename from tests/ui/extenv/extenv-arg-2-not-string-literal.stderr rename to tests/ui/env-macro/env-arg-2-not-string-literal.stderr index 9db1c0be74686..843ce4823ea77 100644 --- a/tests/ui/extenv/extenv-arg-2-not-string-literal.stderr +++ b/tests/ui/env-macro/env-arg-2-not-string-literal.stderr @@ -1,5 +1,5 @@ error: expected string literal - --> $DIR/extenv-arg-2-not-string-literal.rs:1:25 + --> $DIR/env-arg-2-not-string-literal.rs:1:25 | LL | fn main() { env!("one", 10); } | ^^ diff --git a/tests/ui/extenv/extenv-env-overload.rs b/tests/ui/env-macro/env-env-overload.rs similarity index 100% rename from tests/ui/extenv/extenv-env-overload.rs rename to tests/ui/env-macro/env-env-overload.rs diff --git a/tests/ui/extenv/extenv-env.rs b/tests/ui/env-macro/env-env.rs similarity index 100% rename from tests/ui/extenv/extenv-env.rs rename to tests/ui/env-macro/env-env.rs diff --git a/tests/ui/extenv/extenv-escaped-var.rs b/tests/ui/env-macro/env-escaped-var.rs similarity index 100% rename from tests/ui/extenv/extenv-escaped-var.rs rename to tests/ui/env-macro/env-escaped-var.rs diff --git a/tests/ui/extenv/extenv-escaped-var.stderr b/tests/ui/env-macro/env-escaped-var.stderr similarity index 90% rename from tests/ui/extenv/extenv-escaped-var.stderr rename to tests/ui/env-macro/env-escaped-var.stderr index ef5e654d0543a..53a2ead67429d 100644 --- a/tests/ui/extenv/extenv-escaped-var.stderr +++ b/tests/ui/env-macro/env-escaped-var.stderr @@ -1,5 +1,5 @@ error: environment variable `\t` not defined at compile time - --> $DIR/extenv-escaped-var.rs:2:5 + --> $DIR/env-escaped-var.rs:2:5 | LL | env!("\t"); | ^^^^^^^^^^ diff --git a/tests/ui/extenv/extenv-no-args.rs b/tests/ui/env-macro/env-no-args.rs similarity index 100% rename from tests/ui/extenv/extenv-no-args.rs rename to tests/ui/env-macro/env-no-args.rs diff --git a/tests/ui/extenv/extenv-no-args.stderr b/tests/ui/env-macro/env-no-args.stderr similarity index 80% rename from tests/ui/extenv/extenv-no-args.stderr rename to tests/ui/env-macro/env-no-args.stderr index 36d485676c21b..3a94b36cd0f04 100644 --- a/tests/ui/extenv/extenv-no-args.stderr +++ b/tests/ui/env-macro/env-no-args.stderr @@ -1,5 +1,5 @@ error: `env!()` takes 1 or 2 arguments - --> $DIR/extenv-no-args.rs:1:13 + --> $DIR/env-no-args.rs:1:13 | LL | fn main() { env!(); } | ^^^^^^ diff --git a/tests/ui/extenv/extenv-not-defined-custom.rs b/tests/ui/env-macro/env-not-defined-custom.rs similarity index 100% rename from tests/ui/extenv/extenv-not-defined-custom.rs rename to tests/ui/env-macro/env-not-defined-custom.rs diff --git a/tests/ui/extenv/extenv-not-defined-custom.stderr b/tests/ui/env-macro/env-not-defined-custom.stderr similarity index 88% rename from tests/ui/extenv/extenv-not-defined-custom.stderr rename to tests/ui/env-macro/env-not-defined-custom.stderr index 9b6e32bc95f24..70c41bcc52eb3 100644 --- a/tests/ui/extenv/extenv-not-defined-custom.stderr +++ b/tests/ui/env-macro/env-not-defined-custom.stderr @@ -1,5 +1,5 @@ error: my error message - --> $DIR/extenv-not-defined-custom.rs:1:13 + --> $DIR/env-not-defined-custom.rs:1:13 | LL | fn main() { env!("__HOPEFULLY_NOT_DEFINED__", "my error message"); } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/ui/extenv/extenv-not-defined-default.rs b/tests/ui/env-macro/env-not-defined-default.rs similarity index 100% rename from tests/ui/extenv/extenv-not-defined-default.rs rename to tests/ui/env-macro/env-not-defined-default.rs diff --git a/tests/ui/extenv/extenv-not-defined-default.stderr b/tests/ui/env-macro/env-not-defined-default.stderr similarity index 91% rename from tests/ui/extenv/extenv-not-defined-default.stderr rename to tests/ui/env-macro/env-not-defined-default.stderr index 5198818f89cc6..efd7fdb4e5371 100644 --- a/tests/ui/extenv/extenv-not-defined-default.stderr +++ b/tests/ui/env-macro/env-not-defined-default.stderr @@ -1,5 +1,5 @@ error: environment variable `CARGO__HOPEFULLY_NOT_DEFINED__` not defined at compile time - --> $DIR/extenv-not-defined-default.rs:2:5 + --> $DIR/env-not-defined-default.rs:2:5 | LL | env!("CARGO__HOPEFULLY_NOT_DEFINED__"); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/ui/extenv/extenv-not-env.rs b/tests/ui/env-macro/env-not-env.rs similarity index 100% rename from tests/ui/extenv/extenv-not-env.rs rename to tests/ui/env-macro/env-not-env.rs diff --git a/tests/ui/extenv/extenv-not-string-literal.rs b/tests/ui/env-macro/env-not-string-literal.rs similarity index 100% rename from tests/ui/extenv/extenv-not-string-literal.rs rename to tests/ui/env-macro/env-not-string-literal.rs diff --git a/tests/ui/extenv/extenv-not-string-literal.stderr b/tests/ui/env-macro/env-not-string-literal.stderr similarity index 75% rename from tests/ui/extenv/extenv-not-string-literal.stderr rename to tests/ui/env-macro/env-not-string-literal.stderr index 85ed442e2fead..0985459eff924 100644 --- a/tests/ui/extenv/extenv-not-string-literal.stderr +++ b/tests/ui/env-macro/env-not-string-literal.stderr @@ -1,5 +1,5 @@ error: expected string literal - --> $DIR/extenv-not-string-literal.rs:1:18 + --> $DIR/env-not-string-literal.rs:1:18 | LL | fn main() { env!(10, "two"); } | ^^ diff --git a/tests/ui/extenv/extenv-too-many-args.rs b/tests/ui/env-macro/env-too-many-args.rs similarity index 100% rename from tests/ui/extenv/extenv-too-many-args.rs rename to tests/ui/env-macro/env-too-many-args.rs diff --git a/tests/ui/extenv/extenv-too-many-args.stderr b/tests/ui/env-macro/env-too-many-args.stderr similarity index 81% rename from tests/ui/extenv/extenv-too-many-args.stderr rename to tests/ui/env-macro/env-too-many-args.stderr index c0fd5d57251f1..f156026846aaa 100644 --- a/tests/ui/extenv/extenv-too-many-args.stderr +++ b/tests/ui/env-macro/env-too-many-args.stderr @@ -1,5 +1,5 @@ error: `env!()` takes 1 or 2 arguments - --> $DIR/extenv-too-many-args.rs:1:13 + --> $DIR/env-too-many-args.rs:1:13 | LL | fn main() { env!("one", "two", "three"); } | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/tests/ui/extenv/issue-55897.rs b/tests/ui/env-macro/error-recovery-issue-55897.rs similarity index 100% rename from tests/ui/extenv/issue-55897.rs rename to tests/ui/env-macro/error-recovery-issue-55897.rs diff --git a/tests/ui/extenv/issue-55897.stderr b/tests/ui/env-macro/error-recovery-issue-55897.stderr similarity index 85% rename from tests/ui/extenv/issue-55897.stderr rename to tests/ui/env-macro/error-recovery-issue-55897.stderr index 2e8c05cca867f..5a20bf8b16869 100644 --- a/tests/ui/extenv/issue-55897.stderr +++ b/tests/ui/env-macro/error-recovery-issue-55897.stderr @@ -1,5 +1,5 @@ error: environment variable `NON_EXISTENT` not defined at compile time - --> $DIR/issue-55897.rs:10:22 + --> $DIR/error-recovery-issue-55897.rs:10:22 | LL | include!(concat!(env!("NON_EXISTENT"), "/data.rs")); | ^^^^^^^^^^^^^^^^^^^^ @@ -8,13 +8,13 @@ LL | include!(concat!(env!("NON_EXISTENT"), "/data.rs")); = note: this error originates in the macro `env` (in Nightly builds, run with -Z macro-backtrace for more info) error: suffixes on string literals are invalid - --> $DIR/issue-55897.rs:15:22 + --> $DIR/error-recovery-issue-55897.rs:15:22 | LL | include!(concat!("NON_EXISTENT"suffix, "/data.rs")); | ^^^^^^^^^^^^^^^^^^^^ invalid suffix `suffix` error[E0432]: unresolved import `prelude` - --> $DIR/issue-55897.rs:1:5 + --> $DIR/error-recovery-issue-55897.rs:1:5 | LL | use prelude::*; | ^^^^^^^ @@ -23,7 +23,7 @@ LL | use prelude::*; | help: a similar path exists: `std::prelude` error[E0432]: unresolved import `env` - --> $DIR/issue-55897.rs:4:9 + --> $DIR/error-recovery-issue-55897.rs:4:9 | LL | use env; | ^^^ no `env` in the root diff --git a/tests/ui/extenv/issue-110547.rs b/tests/ui/env-macro/name-whitespace-issue-110547.rs similarity index 100% rename from tests/ui/extenv/issue-110547.rs rename to tests/ui/env-macro/name-whitespace-issue-110547.rs diff --git a/tests/ui/extenv/issue-110547.stderr b/tests/ui/env-macro/name-whitespace-issue-110547.stderr similarity index 87% rename from tests/ui/extenv/issue-110547.stderr rename to tests/ui/env-macro/name-whitespace-issue-110547.stderr index 10589ec2f54a4..5f34904d4ae01 100644 --- a/tests/ui/extenv/issue-110547.stderr +++ b/tests/ui/env-macro/name-whitespace-issue-110547.stderr @@ -1,5 +1,5 @@ error: environment variable `\t` not defined at compile time - --> $DIR/issue-110547.rs:4:5 + --> $DIR/name-whitespace-issue-110547.rs:4:5 | LL | env!{"\t"}; | ^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | env!{"\t"}; = note: this error originates in the macro `env` (in Nightly builds, run with -Z macro-backtrace for more info) error: environment variable `\t` not defined at compile time - --> $DIR/issue-110547.rs:5:5 + --> $DIR/name-whitespace-issue-110547.rs:5:5 | LL | env!("\t"); | ^^^^^^^^^^ @@ -17,7 +17,7 @@ LL | env!("\t"); = note: this error originates in the macro `env` (in Nightly builds, run with -Z macro-backtrace for more info) error: environment variable `\u{2069}` not defined at compile time - --> $DIR/issue-110547.rs:6:5 + --> $DIR/name-whitespace-issue-110547.rs:6:5 | LL | env!("\u{2069}"); | ^^^^^^^^^^^^^^^^ diff --git a/tests/ui/extoption_env-no-args.rs b/tests/ui/env-macro/option_env-no-args.rs similarity index 100% rename from tests/ui/extoption_env-no-args.rs rename to tests/ui/env-macro/option_env-no-args.rs diff --git a/tests/ui/extoption_env-no-args.stderr b/tests/ui/env-macro/option_env-no-args.stderr similarity index 78% rename from tests/ui/extoption_env-no-args.stderr rename to tests/ui/env-macro/option_env-no-args.stderr index d40f905b6659d..d621aff770d32 100644 --- a/tests/ui/extoption_env-no-args.stderr +++ b/tests/ui/env-macro/option_env-no-args.stderr @@ -1,5 +1,5 @@ error: option_env! takes 1 argument - --> $DIR/extoption_env-no-args.rs:1:13 + --> $DIR/option_env-no-args.rs:1:13 | LL | fn main() { option_env!(); } | ^^^^^^^^^^^^^ diff --git a/tests/ui/extoption_env-not-defined.rs b/tests/ui/env-macro/option_env-not-defined.rs similarity index 100% rename from tests/ui/extoption_env-not-defined.rs rename to tests/ui/env-macro/option_env-not-defined.rs diff --git a/tests/ui/extoption_env-not-string-literal.rs b/tests/ui/env-macro/option_env-not-string-literal.rs similarity index 100% rename from tests/ui/extoption_env-not-string-literal.rs rename to tests/ui/env-macro/option_env-not-string-literal.rs diff --git a/tests/ui/extoption_env-not-string-literal.stderr b/tests/ui/env-macro/option_env-not-string-literal.stderr similarity index 75% rename from tests/ui/extoption_env-not-string-literal.stderr rename to tests/ui/env-macro/option_env-not-string-literal.stderr index d4fec1b45c9d3..3d2542a0e6c68 100644 --- a/tests/ui/extoption_env-not-string-literal.stderr +++ b/tests/ui/env-macro/option_env-not-string-literal.stderr @@ -1,5 +1,5 @@ error: argument must be a string literal - --> $DIR/extoption_env-not-string-literal.rs:1:25 + --> $DIR/option_env-not-string-literal.rs:1:25 | LL | fn main() { option_env!(10); } | ^^ diff --git a/tests/ui/extoption_env-too-many-args.rs b/tests/ui/env-macro/option_env-too-many-args.rs similarity index 100% rename from tests/ui/extoption_env-too-many-args.rs rename to tests/ui/env-macro/option_env-too-many-args.rs diff --git a/tests/ui/extoption_env-too-many-args.stderr b/tests/ui/env-macro/option_env-too-many-args.stderr similarity index 78% rename from tests/ui/extoption_env-too-many-args.stderr rename to tests/ui/env-macro/option_env-too-many-args.stderr index c7aeaac75dd6d..b4da3670787d3 100644 --- a/tests/ui/extoption_env-too-many-args.stderr +++ b/tests/ui/env-macro/option_env-too-many-args.stderr @@ -1,5 +1,5 @@ error: option_env! takes 1 argument - --> $DIR/extoption_env-too-many-args.rs:1:13 + --> $DIR/option_env-too-many-args.rs:1:13 | LL | fn main() { option_env!("one", "two"); } | ^^^^^^^^^^^^^^^^^^^^^^^^^