Bless tests and new warnings due to formatting changes

compiler-errors · compiler-errors · commit e805151fd47f · 2023-10-13T09:31:36.000Z
diff --git a/compiler/rustc_mir_build/src/thir/pattern/check_match.rs b/compiler/rustc_mir_build/src/thir/pattern/check_match.rs
@@ -569,7 +569,7 @@ fn check_for_bindings_named_same_as_variants(
                 .any(|variant| variant.name == name && variant.ctor_kind() == Some(CtorKind::Const))
         {
             let variant_count = edef.variants().len();
-            let ty_path = with_no_trimmed_paths!({ cx.tcx.def_path_str(edef.did()) });
+            let ty_path = with_no_trimmed_paths!(cx.tcx.def_path_str(edef.did()));
             cx.tcx.emit_spanned_lint(
                 BINDINGS_WITH_VARIANT_NAME,
                 cx.lint_level,
diff --git a/tests/ui/const-generics/generic_const_exprs/issue-80742.stderr b/tests/ui/const-generics/generic_const_exprs/issue-80742.stderr
@@ -1,4 +1,4 @@
-error: internal compiler error: compiler/rustc_const_eval/src/interpret/step.rs:272:21: SizeOf MIR operator called for unsized type dyn Debug
+error: internal compiler error: compiler/rustc_const_eval/src/interpret/step.rs:274:21: SizeOf MIR operator called for unsized type dyn Debug
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
 
 Box<dyn Any>

Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,7 @@ fn check_for_bindings_named_same_as_variants(`
`569`	`569`	`.any(\|variant\| variant.name == name && variant.ctor_kind() == Some(CtorKind::Const))`
`570`	`570`	`{`
`571`	`571`	`let variant_count = edef.variants().len();`
`572`		`- let ty_path = with_no_trimmed_paths!({ cx.tcx.def_path_str(edef.did()) });`
	`572`	`+ let ty_path = with_no_trimmed_paths!(cx.tcx.def_path_str(edef.did()));`
`573`	`573`	`cx.tcx.emit_spanned_lint(`
`574`	`574`	`BINDINGS_WITH_VARIANT_NAME,`
`575`	`575`	`cx.lint_level,`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-error: internal compiler error: compiler/rustc_const_eval/src/interpret/step.rs:272:21: SizeOf MIR operator called for unsized type dyn Debug`
	`1`	`+error: internal compiler error: compiler/rustc_const_eval/src/interpret/step.rs:274:21: SizeOf MIR operator called for unsized type dyn Debug`
`2`	`2`	`--> $SRC_DIR/core/src/mem/mod.rs:LL:COL`
`3`	`3`
`4`	`4`	`Box<dyn Any>`