user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
remove unnecessary to_string
This commit is contained in:
bors 2022-09-21 13:26:05 +00:00
commit 75dd959a3a
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/machine.rs
View file

@ -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!(

2
src/shims/intrinsics/mod.rs
View file

@ -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}`"),