Auto merge of rust-lang#2803 - RalfJung:rustup, r=RalfJung

bors · bors · commit 8770c047abf1 · 2023-02-26T17:17:25.000Z
Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-f715e430aac0de131e2ad21804013ea405722a66
+c4e0cd966062ca67daed20775f4e8a60c28e57df
diff --git a/src/eval.rs b/src/eval.rs
@@ -363,7 +363,7 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
                 tcx,
                 ty::ParamEnv::reveal_all(),
                 start_id,
-                tcx.intern_substs(&[ty::subst::GenericArg::from(main_ret_ty)]),
+                tcx.mk_substs(&[ty::subst::GenericArg::from(main_ret_ty)]),
             )
             .unwrap()
             .unwrap();

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(`
`363`	`363`	`tcx,`
`364`	`364`	`ty::ParamEnv::reveal_all(),`
`365`	`365`	`start_id,`
`366`		`- tcx.intern_substs(&[ty::subst::GenericArg::from(main_ret_ty)]),`
	`366`	`+ tcx.mk_substs(&[ty::subst::GenericArg::from(main_ret_ty)]),`
`367`	`367`	`)`
`368`	`368`	`.unwrap()`
`369`	`369`	`.unwrap();`