Auto merge of #2557 - RalfJung:triple-to-string, r=RalfJung

bors · bors · commit 75dd959a3a40 · 2022-09-21T13:26:05.000Z
remove unnecessary to_string
diff --git a/src/machine.rs b/src/machine.rs
@@ -464,7 +464,7 @@ impl<'mir, 'tcx> MiriMachine<'mir, 'tcx> {
             clock: Clock::new(config.isolated_op == IsolatedOp::Allow),
             #[cfg(unix)]
             external_so_lib: config.external_so_file.as_ref().map(|lib_file_path| {
-                let target_triple = &layout_cx.tcx.sess.opts.target_triple.to_string();
+                let target_triple = layout_cx.tcx.sess.opts.target_triple.triple();
                 // Check if host target == the session target.
                 if env!("TARGET") != target_triple {
                     panic!(
diff --git a/src/shims/intrinsics/mod.rs b/src/shims/intrinsics/mod.rs
@@ -365,7 +365,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
             "breakpoint" => {
                 let [] = check_arg_count(args)?;
                 // normally this would raise a SIGTRAP, which aborts if no debugger is connected
-                throw_machine_stop!(TerminationInfo::Abort("Trace/breakpoint trap".to_string()))
+                throw_machine_stop!(TerminationInfo::Abort(format!("Trace/breakpoint trap")))
             }
 
             name => throw_unsup_format!("unimplemented intrinsic: `{name}`"),

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {`
`365`	`365`	`"breakpoint" => {`
`366`	`366`	`let [] = check_arg_count(args)?;`
`367`	`367`	`// normally this would raise a SIGTRAP, which aborts if no debugger is connected`
`368`		`- throw_machine_stop!(TerminationInfo::Abort("Trace/breakpoint trap".to_string()))`
	`368`	`+ throw_machine_stop!(TerminationInfo::Abort(format!("Trace/breakpoint trap")))`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	name => throw_unsup_format!("unimplemented intrinsic: `{name}`"),