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

Format with stable rustfmt-preview, then with rustfmt-0.9 again.

Browse Source
This commit is contained in:
Dan Gohman
2018-03-30 13:17:15 -07:00
parent d7c66a8ec1
commit 8d5fecd324
127 changed files with 381 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,12 +6,12 @@
use cretonne::timing;
use std::panic::catch_unwind;
use std::path::{Path, PathBuf};
use std::sync::mpsc::{channel, Sender, Receiver};
use std::sync::mpsc::{channel, Receiver, Sender};
use std::sync::{Arc, Mutex};
use std::thread;
use std::time::Duration;
use num_cpus;
use {TestResult, runone};
use {runone, TestResult};
/// Request sent to worker threads contains jobid and path.
struct Request(usize, PathBuf);

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

@@ -8,7 +8,7 @@ use std::fmt::{self, Display};
use std::ffi::OsStr;
use std::path::{Path, PathBuf};
use std::time;
use {TestResult, runone};
use {runone, TestResult};
use concurrent::{ConcurrentRunner, Reply};
/// Timeout in seconds when we're not making progress.
@@ -302,7 +302,6 @@ impl TestRunner {
// Inter-quartile range.
let iqr = q3 - q1;
// Cut-off for what we consider a 'slow' test: 3 IQR from the 75% quartile.
//
// Q3 + 1.5 IQR are the data points that would be plotted as outliers outside a box plot,
@@ -319,7 +318,6 @@ impl TestRunner {
{
println!("slow: {}", t)
}
}
/// Scan pushed directories for tests and run them.

5
lib/filetests/src/runone.rs
View File

@@ -13,8 +13,8 @@ use cretonne::verify_function;
use cretonne::print_errors::pretty_verifier_error;
use cton_reader::parse_test;
use cton_reader::IsaSpec;
use {TestResult, new_subtest};
use subtest::{SubTest, Context, Result};
use {new_subtest, TestResult};
use subtest::{Context, Result, SubTest};
/// Read an entire file into a string.
fn read_to_string<P: AsRef<Path>>(path: P) -> io::Result<String> {
@@ -82,7 +82,6 @@ pub fn run(path: &Path) -> TestResult {
run_one_test(last_tuple, Cow::Owned(func), &mut context)?;
}
Ok(started.elapsed())
}

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

@@ -5,8 +5,8 @@ use std::borrow::Cow;
use cretonne::ir::Function;
use cretonne::isa::TargetIsa;
use cretonne::settings::{Flags, FlagsOrIsa};
use cton_reader::{Details, Comment};
use filecheck::{CheckerBuilder, Checker, NO_VARIABLES};
use cton_reader::{Comment, Details};
use filecheck::{Checker, CheckerBuilder, NO_VARIABLES};
pub type Result<T> = result::Result<T, String>;

30
lib/filetests/src/test_binemit.rs
View File

@@ -13,7 +13,7 @@ use cretonne::ir::entities::AnyEntity;
use cretonne::binemit::RegDiversions;
use cretonne::print_errors::pretty_error;
use cton_reader::TestCommand;
use subtest::{SubTest, Context, Result};
use subtest::{Context, Result, SubTest};
use match_directive::match_directive;
struct TestBinEmit;
@@ -43,8 +43,6 @@ impl TextSink {
}
}
impl binemit::CodeSink for TextSink {
fn offset(&self) -> binemit::CodeOffset {
self.offset
@@ -80,23 +78,11 @@ impl binemit::CodeSink for TextSink {
name: &ir::ExternalName,
addend: binemit::Addend,
) {
write!(
self.text,
"{}({}",
reloc,
name,
).unwrap();
write!(self.text, "{}({}", reloc, name,).unwrap();
if addend != 0 {
write!(
self.text,
"{:+}",
addend,
).unwrap();
write!(self.text, "{:+}", addend,).unwrap();
}
write!(
self.text,
") ",
).unwrap();
write!(self.text, ") ",).unwrap();
}
fn reloc_jt(&mut self, reloc: binemit::Reloc, jt: ir::JumpTable) {
@@ -278,10 +264,10 @@ impl SubTest for TestBinEmit {
));
}
return Err(format!(
"No matching encodings for {} in {}",
func.dfg.display_inst(inst, isa),
DisplayList(&encodings),
));
"No matching encodings for {} in {}",
func.dfg.display_inst(inst, isa),
DisplayList(&encodings),
));
}
let have = sink.text.trim();
if have != want {

2
lib/filetests/src/test_cat.rs
View File

@@ -3,7 +3,7 @@
use std::borrow::Cow;
use cretonne::ir::Function;
use cton_reader::TestCommand;
use subtest::{self, SubTest, Context, Result as STResult};
use subtest::{self, Context, Result as STResult, SubTest};
/// Object implementing the `test cat` sub-test.
///

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

@@ -7,7 +7,7 @@ use cretonne::ir;
use cretonne;
use cretonne::print_errors::pretty_error;
use cton_reader::TestCommand;
use subtest::{SubTest, Context, Result, run_filecheck};
use subtest::{run_filecheck, Context, Result, SubTest};
use std::borrow::Cow;
use std::fmt::Write;

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

@@ -9,7 +9,7 @@ use cretonne::ir::Function;
use cretonne;
use cretonne::print_errors::pretty_error;
use cton_reader::TestCommand;
use subtest::{SubTest, Context, Result, run_filecheck};
use subtest::{run_filecheck, Context, Result, SubTest};
use std::borrow::Cow;
use std::fmt::Write;

8
lib/filetests/src/test_domtree.rs
View File

@@ -17,7 +17,7 @@ use cretonne::flowgraph::ControlFlowGraph;
use cretonne::ir::Function;
use cretonne::ir::entities::AnyEntity;
use cton_reader::TestCommand;
use subtest::{SubTest, Context, Result, run_filecheck};
use subtest::{run_filecheck, Context, Result, SubTest};
use std::borrow::{Borrow, Cow};
use std::collections::HashMap;
use std::fmt::{self, Write};
@@ -76,7 +76,7 @@ impl SubTest for TestDomtree {
Some(got_inst) if got_inst != inst => {
return Err(format!(
"mismatching idoms for {}:\n\
want: {}, got: {}",
want: {}, got: {}",
src_ebb,
inst,
got_inst
@@ -85,7 +85,7 @@ impl SubTest for TestDomtree {
None => {
return Err(format!(
"mismatching idoms for {}:\n\
want: {}, got: unreachable",
want: {}, got: unreachable",
src_ebb,
inst
));
@@ -105,7 +105,7 @@ impl SubTest for TestDomtree {
if let Some(got_inst) = domtree.idom(ebb) {
return Err(format!(
"mismatching idoms for renumbered {}:\n\
want: unrechable, got: {}",
want: unrechable, got: {}",
ebb,
got_inst
));

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

@@ -8,7 +8,7 @@ use cretonne;
use cretonne::ir::Function;
use cretonne::print_errors::pretty_error;
use cton_reader::TestCommand;
use subtest::{SubTest, Context, Result, run_filecheck};
use subtest::{run_filecheck, Context, Result, SubTest};
use std::fmt::Write;
struct TestLegalizer;

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

@@ -9,7 +9,7 @@ use cretonne::ir::Function;
use cretonne;
use cretonne::print_errors::pretty_error;
use cton_reader::TestCommand;
use subtest::{SubTest, Context, Result, run_filecheck};
use subtest::{run_filecheck, Context, Result, SubTest};
use std::borrow::Cow;
use std::fmt::Write;

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

@@ -6,7 +6,7 @@ use cretonne::ir::Function;
use cretonne;
use cretonne::print_errors::pretty_error;
use cton_reader::TestCommand;
use subtest::{SubTest, Context, Result, run_filecheck};
use subtest::{run_filecheck, Context, Result, SubTest};
use std::borrow::Cow;
use std::fmt::Write;

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

@@ -6,7 +6,7 @@ use cretonne::ir::Function;
use cretonne;
use cretonne::print_errors::pretty_error;
use cton_reader::TestCommand;
use subtest::{SubTest, Context, Result, run_filecheck};
use subtest::{run_filecheck, Context, Result, SubTest};
use std::borrow::Cow;
use std::fmt::Write;

2
lib/filetests/src/test_print_cfg.rs
View File

@@ -8,7 +8,7 @@ use std::borrow::Cow;
use cretonne::ir::Function;
use cretonne::cfg_printer::CFGPrinter;
use cton_reader::TestCommand;
use subtest::{self, SubTest, Context, Result as STResult};
use subtest::{self, Context, Result as STResult, SubTest};
/// Object implementing the `test print-cfg` sub-test.
struct TestPrintCfg;

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

@@ -9,7 +9,7 @@ use cretonne::ir::Function;
use cretonne;
use cretonne::print_errors::pretty_error;
use cton_reader::TestCommand;
use subtest::{SubTest, Context, Result, run_filecheck};
use subtest::{run_filecheck, Context, Result, SubTest};
use std::borrow::Cow;
use std::fmt::Write;

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

@@ -9,7 +9,7 @@ use cretonne::ir::Function;
use cretonne;
use cretonne::print_errors::pretty_error;
use cton_reader::TestCommand;
use subtest::{SubTest, Context, Result, run_filecheck};
use subtest::{run_filecheck, Context, Result, SubTest};
use std::borrow::Cow;
use std::fmt::Write;

2
lib/filetests/src/test_verifier.rs
View File

@@ -13,7 +13,7 @@ use std::borrow::{Borrow, Cow};
use cretonne::verify_function;
use cretonne::ir::Function;
use cton_reader::TestCommand;
use subtest::{SubTest, Context, Result};
use subtest::{Context, Result, SubTest};
use match_directive::match_directive;
struct TestVerifier;