T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use to_string() instead of write!(&mut text, "{}", ....

Browse Source
This commit is contained in:
Dan Gohman
2018-06-04 16:29:13 -07:00
parent 4a4453dc47
commit 1087ff3a01
8 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/filetests/src/test_compile.rs
View File

@@ -7,7 +7,6 @@ use cretonne_codegen::print_errors::pretty_error;
use cretonne_codegen::{binemit, ir};
use cretonne_reader::TestCommand;
use std::borrow::Cow;
use std::fmt::Write;
use subtest::{run_filecheck, Context, Result, SubTest};
struct TestCompile;
@@ -64,8 +63,7 @@ impl SubTest for TestCompile {
}
// Run final code through filecheck.
let mut text = String::new();
write!(&mut text, "{}", &comp_ctx.func.display(Some(isa))).map_err(|e| e.to_string())?;
let text = comp_ctx.func.display(Some(isa)).to_string();
run_filecheck(&text, context)
}
}

4
lib/filetests/src/test_dce.rs
View File

@@ -10,7 +10,6 @@ use cretonne_codegen::ir::Function;
use cretonne_codegen::print_errors::pretty_error;
use cretonne_reader::TestCommand;
use std::borrow::Cow;
use std::fmt::Write;
use subtest::{run_filecheck, Context, Result, SubTest};
struct TestDCE;
@@ -42,8 +41,7 @@ impl SubTest for TestDCE {
.dce(context.flags_or_isa())
.map_err(|e| pretty_error(&comp_ctx.func, context.isa, Into::into(e)))?;
let mut text = String::new();
write!(&mut text, "{}", &comp_ctx.func).map_err(|e| e.to_string())?;
let text = comp_ctx.func.to_string();
run_filecheck(&text, context)
}
}

4
lib/filetests/src/test_legalizer.rs
View File

@@ -8,7 +8,6 @@ use cretonne_codegen::ir::Function;
use cretonne_codegen::print_errors::pretty_error;
use cretonne_reader::TestCommand;
use std::borrow::Cow;
use std::fmt::Write;
use subtest::{run_filecheck, Context, Result, SubTest};
struct TestLegalizer;
@@ -44,8 +43,7 @@ impl SubTest for TestLegalizer {
.legalize(isa)
.map_err(|e| pretty_error(&comp_ctx.func, context.isa, e))?;
let mut text = String::new();
write!(&mut text, "{}", &comp_ctx.func.display(Some(isa))).map_err(|e| e.to_string())?;
let text = comp_ctx.func.display(Some(isa)).to_string();
run_filecheck(&text, context)
}
}

4
lib/filetests/src/test_licm.rs
View File

@@ -10,7 +10,6 @@ use cretonne_codegen::ir::Function;
use cretonne_codegen::print_errors::pretty_error;
use cretonne_reader::TestCommand;
use std::borrow::Cow;
use std::fmt::Write;
use subtest::{run_filecheck, Context, Result, SubTest};
struct TestLICM;
@@ -42,8 +41,7 @@ impl SubTest for TestLICM {
.licm(context.flags_or_isa())
.map_err(|e| pretty_error(&comp_ctx.func, context.isa, Into::into(e)))?;
let mut text = String::new();
write!(&mut text, "{}", &comp_ctx.func).map_err(|e| e.to_string())?;
let text = comp_ctx.func.to_string();
run_filecheck(&text, context)
}
}

4
lib/filetests/src/test_postopt.rs
View File

@@ -7,7 +7,6 @@ use cretonne_codegen::ir::Function;
use cretonne_codegen::print_errors::pretty_error;
use cretonne_reader::TestCommand;
use std::borrow::Cow;
use std::fmt::Write;
use subtest::{run_filecheck, Context, Result, SubTest};
struct TestPostopt;
@@ -39,8 +38,7 @@ impl SubTest for TestPostopt {
.postopt(isa)
.map_err(|e| pretty_error(&comp_ctx.func, context.isa, Into::into(e)))?;
let mut text = String::new();
write!(&mut text, "{}", &comp_ctx.func).map_err(|e| e.to_string())?;
let text = comp_ctx.func.to_string();
run_filecheck(&text, context)
}
}

4
lib/filetests/src/test_preopt.rs
View File

@@ -7,7 +7,6 @@ use cretonne_codegen::ir::Function;
use cretonne_codegen::print_errors::pretty_error;
use cretonne_reader::TestCommand;
use std::borrow::Cow;
use std::fmt::Write;
use subtest::{run_filecheck, Context, Result, SubTest};
struct TestPreopt;
@@ -39,8 +38,7 @@ impl SubTest for TestPreopt {
.preopt(isa)
.map_err(|e| pretty_error(&comp_ctx.func, context.isa, Into::into(e)))?;
let mut text = String::new();
write!(&mut text, "{}", &comp_ctx.func).map_err(|e| e.to_string())?;
let text = &comp_ctx.func.to_string();
run_filecheck(&text, context)
}
}

4
lib/filetests/src/test_regalloc.rs
View File

@@ -10,7 +10,6 @@ use cretonne_codegen::ir::Function;
use cretonne_codegen::print_errors::pretty_error;
use cretonne_reader::TestCommand;
use std::borrow::Cow;
use std::fmt::Write;
use subtest::{run_filecheck, Context, Result, SubTest};
struct TestRegalloc;
@@ -51,8 +50,7 @@ impl SubTest for TestRegalloc {
.regalloc(isa)
.map_err(|e| pretty_error(&comp_ctx.func, context.isa, e))?;
let mut text = String::new();
write!(&mut text, "{}", &comp_ctx.func.display(Some(isa))).map_err(|e| e.to_string())?;
let text = comp_ctx.func.display(Some(isa)).to_string();
run_filecheck(&text, context)
}
}

4
lib/filetests/src/test_simple_gvn.rs
View File

@@ -10,7 +10,6 @@ use cretonne_codegen::ir::Function;
use cretonne_codegen::print_errors::pretty_error;
use cretonne_reader::TestCommand;
use std::borrow::Cow;
use std::fmt::Write;
use subtest::{run_filecheck, Context, Result, SubTest};
struct TestSimpleGVN;
@@ -41,8 +40,7 @@ impl SubTest for TestSimpleGVN {
.simple_gvn(context.flags_or_isa())
.map_err(|e| pretty_error(&comp_ctx.func, context.isa, Into::into(e)))?;
let mut text = String::new();
write!(&mut text, "{}", &comp_ctx.func).map_err(|e| e.to_string())?;
let text = comp_ctx.func.to_string();
run_filecheck(&text, context)
}
}