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

remove unnecessary to_string
rust-lang · Sep 21, 2022 · 75dd959 · 75dd959
2 parents 351afbb + c672c35
commit 75dd959
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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}`"),