Auto merge of #2933 - RalfJung:rustup, r=RalfJung

bors · bors · commit f0e0ed0c1a26 · 2023-06-17T15:43:17.000Z
Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-c84d5e7078435a0ddd8770c3530fe7fdbf026ec4
+7513407ac8e673f536d34743fe393bd8b7c45441
diff --git a/tests/fail/terminate-terminator.rs b/tests/fail/terminate-terminator.rs
@@ -1,4 +1,4 @@
-//@compile-flags: -Zmir-opt-level=3
+//@compile-flags: -Zmir-opt-level=3 -Zinline-mir-hint-threshold=1000
 // Enable MIR inlining to ensure that `TerminatorKind::Terminate` is generated
 // instead of just `UnwindAction::Terminate`.
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//@compile-flags: -Zmir-opt-level=3`
	`1`	`+//@compile-flags: -Zmir-opt-level=3 -Zinline-mir-hint-threshold=1000`
`2`	`2`	// Enable MIR inlining to ensure that `TerminatorKind::Terminate` is generated
`3`	`3`	// instead of just `UnwindAction::Terminate`.
`4`	`4`