Skip to content

Commit a42873e

Browse files
borsbors
committed
Auto merge of rust-lang#122676 - matthiaskrgr:rollup-noti0vr, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - rust-lang#122639 (Fix typos) - rust-lang#122654 (interpret/memory: explain why we use == on bool) - rust-lang#122656 (simplify_cfg: rename some passes so that they make more sense) - rust-lang#122657 (Move `option_env!` and `env!` tests to the `env-macro` directory) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 80e5694 + 069b933 commit a42873e

File tree

62 files changed

+65
-62
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+65
-62
lines changed

‎compiler/rustc_const_eval/src/interpret/memory.rs

+2
Original file line numberDiff line numberDiff line change
@@ -949,6 +949,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
949949
/// Runs the close in "validation" mode, which means the machine's memory read hooks will be
950950
/// suppressed. Needless to say, this must only be set with great care! Cannot be nested.
951951
pub(super) fn run_for_validation<R>(&self, f: impl FnOnce() -> R) -> R {
952+
// This deliberately uses `==` on `bool` to follow the pattern
953+
// `assert!(val.replace(new) == old)`.
952954
assert!(
953955
self.memory.validation_in_progress.replace(true) == false,
954956
"`validation_in_progress` was already set"

‎compiler/rustc_hir_typeck/src/method/probe.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1935,7 +1935,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
19351935
}
19361936
}
19371937

1938-
/// Determine if the associated item withe the given DefId matches
1938+
/// Determine if the associated item with the given DefId matches
19391939
/// the desired name via a doc alias.
19401940
fn matches_by_doc_alias(&self, def_id: DefId) -> bool {
19411941
let Some(name) = self.method_name else {

‎compiler/rustc_mir_build/src/build/scope.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
774774
let (current_root, parent_root) =
775775
if self.tcx.sess.opts.unstable_opts.maximal_hir_to_mir_coverage {
776776
// Some consumers of rustc need to map MIR locations back to HIR nodes. Currently
777-
// the the only part of rustc that tracks MIR -> HIR is the
777+
// the only part of rustc that tracks MIR -> HIR is the
778778
// `SourceScopeLocalData::lint_root` field that tracks lint levels for MIR
779779
// locations. Normally the number of source scopes is limited to the set of nodes
780780
// with lint annotations. The -Zmaximal-hir-to-mir-coverage flag changes this

‎compiler/rustc_mir_transform/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ fn run_analysis_cleanup_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
507507
let passes: &[&dyn MirPass<'tcx>] = &[
508508
&cleanup_post_borrowck::CleanupPostBorrowck,
509509
&remove_noop_landing_pads::RemoveNoopLandingPads,
510-
&simplify::SimplifyCfg::EarlyOpt,
510+
&simplify::SimplifyCfg::PostAnalysis,
511511
&deref_separator::Derefer,
512512
];
513513

@@ -544,7 +544,7 @@ fn run_runtime_cleanup_passes<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) {
544544
let passes: &[&dyn MirPass<'tcx>] = &[
545545
&lower_intrinsics::LowerIntrinsics,
546546
&remove_place_mention::RemovePlaceMention,
547-
&simplify::SimplifyCfg::ElaborateDrops,
547+
&simplify::SimplifyCfg::PreOptimizations,
548548
];
549549

550550
pm::run_passes(tcx, body, passes, Some(MirPhase::Runtime(RuntimePhase::PostCleanup)));

‎compiler/rustc_mir_transform/src/simplify.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,11 @@ pub enum SimplifyCfg {
3737
Initial,
3838
PromoteConsts,
3939
RemoveFalseEdges,
40-
EarlyOpt,
41-
ElaborateDrops,
40+
/// Runs at the beginning of "analysis to runtime" lowering, *before* drop elaboration.
41+
PostAnalysis,
42+
/// Runs at the end of "analysis to runtime" lowering, *after* drop elaboration.
43+
/// This is before the main optimization passes on runtime MIR kick in.
44+
PreOptimizations,
4245
Final,
4346
MakeShim,
4447
AfterUninhabitedEnumBranching,
@@ -50,8 +53,8 @@ impl SimplifyCfg {
5053
SimplifyCfg::Initial => "SimplifyCfg-initial",
5154
SimplifyCfg::PromoteConsts => "SimplifyCfg-promote-consts",
5255
SimplifyCfg::RemoveFalseEdges => "SimplifyCfg-remove-false-edges",
53-
SimplifyCfg::EarlyOpt => "SimplifyCfg-early-opt",
54-
SimplifyCfg::ElaborateDrops => "SimplifyCfg-elaborate-drops",
56+
SimplifyCfg::PostAnalysis => "SimplifyCfg-post-analysis",
57+
SimplifyCfg::PreOptimizations => "SimplifyCfg-pre-optimizations",
5558
SimplifyCfg::Final => "SimplifyCfg-final",
5659
SimplifyCfg::MakeShim => "SimplifyCfg-make_shim",
5760
SimplifyCfg::AfterUninhabitedEnumBranching => {

‎src/tools/tidy/src/issues.txt

-2
Original file line numberDiff line numberDiff line change
@@ -968,8 +968,6 @@
968968
"ui/errors/issue-89280-emitter-overflow-splice-lines.rs",
969969
"ui/errors/issue-99572-impl-trait-on-pointer.rs",
970970
"ui/expr/if/issue-4201.rs",
971-
"ui/extenv/issue-110547.rs",
972-
"ui/extenv/issue-55897.rs",
973971
"ui/extern/auxiliary/issue-80074-macro-2.rs",
974972
"ui/extern/auxiliary/issue-80074-macro.rs",
975973
"ui/extern/issue-10025.rs",

‎src/tools/tidy/src/ui_tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const ENTRY_LIMIT: usize = 900;
1818
// FIXME: The following limits should be reduced eventually.
1919

2020
const ISSUES_ENTRY_LIMIT: usize = 1750;
21-
const ROOT_ENTRY_LIMIT: usize = 866;
21+
const ROOT_ENTRY_LIMIT: usize = 859;
2222

2323
const EXPECTED_TEST_FILE_EXTENSIONS: &[&str] = &[
2424
"rs", // test source files

‎tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.panic-abort.mir ‎tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-pre-optimizations.after.panic-abort.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `main` after SimplifyCfg-elaborate-drops
1+
// MIR for `main` after SimplifyCfg-pre-optimizations
22

33
fn main() -> () {
44
let mut _0: ();

‎tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.panic-unwind.mir ‎tests/mir-opt/array_index_is_temporary.main.SimplifyCfg-pre-optimizations.after.panic-unwind.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `main` after SimplifyCfg-elaborate-drops
1+
// MIR for `main` after SimplifyCfg-pre-optimizations
22

33
fn main() -> () {
44
let mut _0: ();

‎tests/mir-opt/array_index_is_temporary.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//@ unit-test: SimplifyCfg-elaborate-drops
1+
//@ unit-test: SimplifyCfg-pre-optimizations
22
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
33
// Retagging (from Stacked Borrows) relies on the array index being a fresh
44
// temporary, so that side-effects cannot change it.
@@ -10,7 +10,7 @@ unsafe fn foo(z: *mut usize) -> u32 {
1010
}
1111

1212

13-
// EMIT_MIR array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir
13+
// EMIT_MIR array_index_is_temporary.main.SimplifyCfg-pre-optimizations.after.mir
1414
fn main() {
1515
// CHECK-LABEL: fn main(
1616
// CHECK: debug x => [[x:_.*]];

‎tests/mir-opt/byte_slice.main.SimplifyCfg-elaborate-drops.after.mir ‎tests/mir-opt/byte_slice.main.SimplifyCfg-pre-optimizations.after.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `main` after SimplifyCfg-elaborate-drops
1+
// MIR for `main` after SimplifyCfg-pre-optimizations
22

33
fn main() -> () {
44
let mut _0: ();

‎tests/mir-opt/byte_slice.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// skip-filecheck
22
//@ compile-flags: -Z mir-opt-level=0
33

4-
// EMIT_MIR byte_slice.main.SimplifyCfg-elaborate-drops.after.mir
4+
// EMIT_MIR byte_slice.main.SimplifyCfg-pre-optimizations.after.mir
55
fn main() {
66
let x = b"foo";
77
let y = [5u8, b'x'];

‎tests/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-elaborate-drops.after.mir ‎tests/mir-opt/const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-pre-optimizations.after.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `BAR::promoted[0]` after SimplifyCfg-elaborate-drops
1+
// MIR for `BAR::promoted[0]` after SimplifyCfg-pre-optimizations
22

33
const BAR::promoted[0]: &[&i32; 1] = {
44
let mut _0: &[&i32; 1];

‎tests/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-elaborate-drops.after.mir ‎tests/mir-opt/const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-pre-optimizations.after.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `FOO::promoted[0]` after SimplifyCfg-elaborate-drops
1+
// MIR for `FOO::promoted[0]` after SimplifyCfg-pre-optimizations
22

33
const FOO::promoted[0]: &[&i32; 1] = {
44
let mut _0: &[&i32; 1];

‎tests/mir-opt/const_promotion_extern_static.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ extern "C" {
66
static Y: i32 = 42;
77

88
// EMIT_MIR const_promotion_extern_static.BAR.PromoteTemps.diff
9-
// EMIT_MIR const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-elaborate-drops.after.mir
9+
// EMIT_MIR const_promotion_extern_static.BAR-promoted[0].SimplifyCfg-pre-optimizations.after.mir
1010
static mut BAR: *const &i32 = [&Y].as_ptr();
1111

1212
// EMIT_MIR const_promotion_extern_static.FOO.PromoteTemps.diff
13-
// EMIT_MIR const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-elaborate-drops.after.mir
13+
// EMIT_MIR const_promotion_extern_static.FOO-promoted[0].SimplifyCfg-pre-optimizations.after.mir
1414
static mut FOO: *const &i32 = [unsafe { &X }].as_ptr();
1515

1616
// EMIT_MIR const_promotion_extern_static.BOP.built.after.mir

‎tests/mir-opt/no_drop_for_inactive_variant.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Ensure that there are no drop terminators in `unwrap<T>` (except the one along the cleanup
55
// path).
66

7-
// EMIT_MIR no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.mir
7+
// EMIT_MIR no_drop_for_inactive_variant.unwrap.SimplifyCfg-pre-optimizations.after.mir
88
fn unwrap<T>(opt: Option<T>) -> T {
99
match opt {
1010
Some(x) => x,

‎tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.panic-abort.mir ‎tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-pre-optimizations.after.panic-abort.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `unwrap` after SimplifyCfg-elaborate-drops
1+
// MIR for `unwrap` after SimplifyCfg-pre-optimizations
22

33
fn unwrap(_1: Option<T>) -> T {
44
debug opt => _1;

‎tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-elaborate-drops.after.panic-unwind.mir ‎tests/mir-opt/no_drop_for_inactive_variant.unwrap.SimplifyCfg-pre-optimizations.after.panic-unwind.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `unwrap` after SimplifyCfg-elaborate-drops
1+
// MIR for `unwrap` after SimplifyCfg-pre-optimizations
22

33
fn unwrap(_1: Option<T>) -> T {
44
debug opt => _1;

‎tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.panic-abort.mir ‎tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-pre-optimizations.after.panic-abort.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `main` after SimplifyCfg-elaborate-drops
1+
// MIR for `main` after SimplifyCfg-pre-optimizations
22

33
fn main() -> () {
44
let mut _0: ();

‎tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.panic-unwind.mir ‎tests/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-pre-optimizations.after.panic-unwind.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `main` after SimplifyCfg-elaborate-drops
1+
// MIR for `main` after SimplifyCfg-pre-optimizations
22

33
fn main() -> () {
44
let mut _0: ();

‎tests/mir-opt/packed_struct_drop_aligned.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
33

44

5-
// EMIT_MIR packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir
5+
// EMIT_MIR packed_struct_drop_aligned.main.SimplifyCfg-pre-optimizations.after.mir
66
fn main() {
77
let mut x = Packed(Aligned(Droppy(0)));
88
x.0 = Aligned(Droppy(0));

‎tests/mir-opt/retag.array_casts.SimplifyCfg-elaborate-drops.after.panic-abort.mir ‎tests/mir-opt/retag.array_casts.SimplifyCfg-pre-optimizations.after.panic-abort.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `array_casts` after SimplifyCfg-elaborate-drops
1+
// MIR for `array_casts` after SimplifyCfg-pre-optimizations
22

33
fn array_casts() -> () {
44
let mut _0: ();

‎tests/mir-opt/retag.array_casts.SimplifyCfg-elaborate-drops.after.panic-unwind.mir ‎tests/mir-opt/retag.array_casts.SimplifyCfg-pre-optimizations.after.panic-unwind.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `array_casts` after SimplifyCfg-elaborate-drops
1+
// MIR for `array_casts` after SimplifyCfg-pre-optimizations
22

33
fn array_casts() -> () {
44
let mut _0: ();

‎tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.panic-unwind.mir ‎tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-pre-optimizations.after.panic-abort.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `main::{closure#0}` after SimplifyCfg-elaborate-drops
1+
// MIR for `main::{closure#0}` after SimplifyCfg-pre-optimizations
22

33
fn main::{closure#0}(_1: &{closure@main::{closure#0}}, _2: &i32) -> &i32 {
44
debug x => _2;

‎tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.panic-abort.mir ‎tests/mir-opt/retag.main-{closure#0}.SimplifyCfg-pre-optimizations.after.panic-unwind.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `main::{closure#0}` after SimplifyCfg-elaborate-drops
1+
// MIR for `main::{closure#0}` after SimplifyCfg-pre-optimizations
22

33
fn main::{closure#0}(_1: &{closure@main::{closure#0}}, _2: &i32) -> &i32 {
44
debug x => _2;

‎tests/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.panic-abort.mir ‎tests/mir-opt/retag.main.SimplifyCfg-pre-optimizations.after.panic-abort.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `main` after SimplifyCfg-elaborate-drops
1+
// MIR for `main` after SimplifyCfg-pre-optimizations
22

33
fn main() -> () {
44
let mut _0: ();

‎tests/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.panic-unwind.mir ‎tests/mir-opt/retag.main.SimplifyCfg-pre-optimizations.after.panic-unwind.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `main` after SimplifyCfg-elaborate-drops
1+
// MIR for `main` after SimplifyCfg-pre-optimizations
22

33
fn main() -> () {
44
let mut _0: ();

‎tests/mir-opt/retag.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
struct Test(i32);
1010

11-
// EMIT_MIR retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.mir
12-
// EMIT_MIR retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.mir
11+
// EMIT_MIR retag.{impl#0}-foo.SimplifyCfg-pre-optimizations.after.mir
12+
// EMIT_MIR retag.{impl#0}-foo_shr.SimplifyCfg-pre-optimizations.after.mir
1313
impl Test {
1414
// Make sure we run the pass on a method, not just on bare functions.
1515
fn foo<'x>(&self, x: &'x mut i32) -> &'x mut i32 {
@@ -26,8 +26,8 @@ impl Drop for Test {
2626
fn drop(&mut self) {}
2727
}
2828

29-
// EMIT_MIR retag.main.SimplifyCfg-elaborate-drops.after.mir
30-
// EMIT_MIR retag.main-{closure#0}.SimplifyCfg-elaborate-drops.after.mir
29+
// EMIT_MIR retag.main.SimplifyCfg-pre-optimizations.after.mir
30+
// EMIT_MIR retag.main-{closure#0}.SimplifyCfg-pre-optimizations.after.mir
3131
pub fn main() {
3232
let mut x = 0;
3333
{
@@ -55,7 +55,7 @@ pub fn main() {
5555
}
5656

5757
/// Casting directly to an array should also go through `&raw` and thus add appropriate retags.
58-
// EMIT_MIR retag.array_casts.SimplifyCfg-elaborate-drops.after.mir
58+
// EMIT_MIR retag.array_casts.SimplifyCfg-pre-optimizations.after.mir
5959
fn array_casts() {
6060
let mut x: [usize; 2] = [0, 0];
6161
let p = &mut x as *mut usize;

‎tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.panic-unwind.mir ‎tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-pre-optimizations.after.panic-abort.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `<impl at $DIR/retag.rs:13:1: 13:10>::foo` after SimplifyCfg-elaborate-drops
1+
// MIR for `<impl at $DIR/retag.rs:13:1: 13:10>::foo` after SimplifyCfg-pre-optimizations
22

33
fn <impl at $DIR/retag.rs:13:1: 13:10>::foo(_1: &Test, _2: &mut i32) -> &mut i32 {
44
debug self => _1;

‎tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-elaborate-drops.after.panic-abort.mir ‎tests/mir-opt/retag.{impl#0}-foo.SimplifyCfg-pre-optimizations.after.panic-unwind.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `<impl at $DIR/retag.rs:13:1: 13:10>::foo` after SimplifyCfg-elaborate-drops
1+
// MIR for `<impl at $DIR/retag.rs:13:1: 13:10>::foo` after SimplifyCfg-pre-optimizations
22

33
fn <impl at $DIR/retag.rs:13:1: 13:10>::foo(_1: &Test, _2: &mut i32) -> &mut i32 {
44
debug self => _1;

‎tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.panic-abort.mir ‎tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-pre-optimizations.after.panic-abort.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `<impl at $DIR/retag.rs:13:1: 13:10>::foo_shr` after SimplifyCfg-elaborate-drops
1+
// MIR for `<impl at $DIR/retag.rs:13:1: 13:10>::foo_shr` after SimplifyCfg-pre-optimizations
22

33
fn <impl at $DIR/retag.rs:13:1: 13:10>::foo_shr(_1: &Test, _2: &i32) -> &i32 {
44
debug self => _1;

‎tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-elaborate-drops.after.panic-unwind.mir ‎tests/mir-opt/retag.{impl#0}-foo_shr.SimplifyCfg-pre-optimizations.after.panic-unwind.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// MIR for `<impl at $DIR/retag.rs:13:1: 13:10>::foo_shr` after SimplifyCfg-elaborate-drops
1+
// MIR for `<impl at $DIR/retag.rs:13:1: 13:10>::foo_shr` after SimplifyCfg-pre-optimizations
22

33
fn <impl at $DIR/retag.rs:13:1: 13:10>::foo_shr(_1: &Test, _2: &i32) -> &i32 {
44
debug self => _1;

‎tests/mir-opt/simplify_cfg.main.SimplifyCfg-early-opt.diff ‎tests/mir-opt/simplify_cfg.main.SimplifyCfg-post-analysis.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
- // MIR for `main` before SimplifyCfg-early-opt
2-
+ // MIR for `main` after SimplifyCfg-early-opt
1+
- // MIR for `main` before SimplifyCfg-post-analysis
2+
+ // MIR for `main` after SimplifyCfg-post-analysis
33

44
fn main() -> () {
55
let mut _0: ();

‎tests/mir-opt/simplify_cfg.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//@ no-prefer-dynamic
55

66
// EMIT_MIR simplify_cfg.main.SimplifyCfg-initial.diff
7-
// EMIT_MIR simplify_cfg.main.SimplifyCfg-early-opt.diff
7+
// EMIT_MIR simplify_cfg.main.SimplifyCfg-post-analysis.diff
88
fn main() {
99
loop {
1010
if bar() {

‎tests/ui/extenv/extenv-arg-2-not-string-literal.rs ‎tests/ui/env-macro/env-arg-2-not-string-literal.rs

File renamed without changes.

‎tests/ui/extenv/extenv-arg-2-not-string-literal.stderr ‎tests/ui/env-macro/env-arg-2-not-string-literal.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: expected string literal
2-
--> $DIR/extenv-arg-2-not-string-literal.rs:1:25
2+
--> $DIR/env-arg-2-not-string-literal.rs:1:25
33
|
44
LL | fn main() { env!("one", 10); }
55
| ^^

‎tests/ui/extenv/extenv-env-overload.rs ‎tests/ui/env-macro/env-env-overload.rs

File renamed without changes.

‎tests/ui/extenv/extenv-env.rs ‎tests/ui/env-macro/env-env.rs

File renamed without changes.

‎tests/ui/extenv/extenv-escaped-var.rs ‎tests/ui/env-macro/env-escaped-var.rs

File renamed without changes.

‎tests/ui/extenv/extenv-escaped-var.stderr ‎tests/ui/env-macro/env-escaped-var.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: environment variable `\t` not defined at compile time
2-
--> $DIR/extenv-escaped-var.rs:2:5
2+
--> $DIR/env-escaped-var.rs:2:5
33
|
44
LL | env!("\t");
55
| ^^^^^^^^^^

‎tests/ui/extenv/extenv-no-args.rs ‎tests/ui/env-macro/env-no-args.rs

File renamed without changes.

‎tests/ui/extenv/extenv-no-args.stderr ‎tests/ui/env-macro/env-no-args.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: `env!()` takes 1 or 2 arguments
2-
--> $DIR/extenv-no-args.rs:1:13
2+
--> $DIR/env-no-args.rs:1:13
33
|
44
LL | fn main() { env!(); }
55
| ^^^^^^

‎tests/ui/extenv/extenv-not-defined-custom.rs ‎tests/ui/env-macro/env-not-defined-custom.rs

File renamed without changes.

‎tests/ui/extenv/extenv-not-defined-custom.stderr ‎tests/ui/env-macro/env-not-defined-custom.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: my error message
2-
--> $DIR/extenv-not-defined-custom.rs:1:13
2+
--> $DIR/env-not-defined-custom.rs:1:13
33
|
44
LL | fn main() { env!("__HOPEFULLY_NOT_DEFINED__", "my error message"); }
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/extenv/extenv-not-defined-default.rs ‎tests/ui/env-macro/env-not-defined-default.rs

File renamed without changes.

‎tests/ui/extenv/extenv-not-defined-default.stderr ‎tests/ui/env-macro/env-not-defined-default.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: environment variable `CARGO__HOPEFULLY_NOT_DEFINED__` not defined at compile time
2-
--> $DIR/extenv-not-defined-default.rs:2:5
2+
--> $DIR/env-not-defined-default.rs:2:5
33
|
44
LL | env!("CARGO__HOPEFULLY_NOT_DEFINED__");
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/extenv/extenv-not-env.rs ‎tests/ui/env-macro/env-not-env.rs

File renamed without changes.

‎tests/ui/extenv/extenv-not-string-literal.rs ‎tests/ui/env-macro/env-not-string-literal.rs

File renamed without changes.

‎tests/ui/extenv/extenv-not-string-literal.stderr ‎tests/ui/env-macro/env-not-string-literal.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: expected string literal
2-
--> $DIR/extenv-not-string-literal.rs:1:18
2+
--> $DIR/env-not-string-literal.rs:1:18
33
|
44
LL | fn main() { env!(10, "two"); }
55
| ^^

‎tests/ui/extenv/extenv-too-many-args.rs ‎tests/ui/env-macro/env-too-many-args.rs

File renamed without changes.

‎tests/ui/extenv/extenv-too-many-args.stderr ‎tests/ui/env-macro/env-too-many-args.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: `env!()` takes 1 or 2 arguments
2-
--> $DIR/extenv-too-many-args.rs:1:13
2+
--> $DIR/env-too-many-args.rs:1:13
33
|
44
LL | fn main() { env!("one", "two", "three"); }
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/extenv/issue-55897.rs ‎tests/ui/env-macro/error-recovery-issue-55897.rs

File renamed without changes.

‎tests/ui/extenv/issue-55897.stderr ‎tests/ui/env-macro/error-recovery-issue-55897.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: environment variable `NON_EXISTENT` not defined at compile time
2-
--> $DIR/issue-55897.rs:10:22
2+
--> $DIR/error-recovery-issue-55897.rs:10:22
33
|
44
LL | include!(concat!(env!("NON_EXISTENT"), "/data.rs"));
55
| ^^^^^^^^^^^^^^^^^^^^
@@ -8,13 +8,13 @@ LL | include!(concat!(env!("NON_EXISTENT"), "/data.rs"));
88
= note: this error originates in the macro `env` (in Nightly builds, run with -Z macro-backtrace for more info)
99

1010
error: suffixes on string literals are invalid
11-
--> $DIR/issue-55897.rs:15:22
11+
--> $DIR/error-recovery-issue-55897.rs:15:22
1212
|
1313
LL | include!(concat!("NON_EXISTENT"suffix, "/data.rs"));
1414
| ^^^^^^^^^^^^^^^^^^^^ invalid suffix `suffix`
1515

1616
error[E0432]: unresolved import `prelude`
17-
--> $DIR/issue-55897.rs:1:5
17+
--> $DIR/error-recovery-issue-55897.rs:1:5
1818
|
1919
LL | use prelude::*;
2020
| ^^^^^^^
@@ -23,7 +23,7 @@ LL | use prelude::*;
2323
| help: a similar path exists: `std::prelude`
2424

2525
error[E0432]: unresolved import `env`
26-
--> $DIR/issue-55897.rs:4:9
26+
--> $DIR/error-recovery-issue-55897.rs:4:9
2727
|
2828
LL | use env;
2929
| ^^^ no `env` in the root

‎tests/ui/extenv/issue-110547.rs ‎tests/ui/env-macro/name-whitespace-issue-110547.rs

File renamed without changes.

0 commit comments

Comments
 (0)