Avoid uninteresting renaming of imports.

This commit is contained in:
Dan Gohman
2018-06-12 04:44:07 -07:00
parent ffe57d9051
commit 683880bd02
2 changed files with 6 additions and 6 deletions

View File

@@ -3,7 +3,7 @@
use cretonne_codegen::ir::Function;
use cretonne_reader::TestCommand;
use std::borrow::Cow;
use subtest::{self, Context, SubTest, SubtestResult as STResult};
use subtest::{self, Context, SubTest, SubtestResult};
/// Object implementing the `test cat` sub-test.
///
@@ -13,7 +13,7 @@ use subtest::{self, Context, SubTest, SubtestResult as STResult};
/// The result is verified by filecheck.
struct TestCat;
pub fn subtest(parsed: &TestCommand) -> STResult<Box<SubTest>> {
pub fn subtest(parsed: &TestCommand) -> SubtestResult<Box<SubTest>> {
assert_eq!(parsed.command, "cat");
if !parsed.options.is_empty() {
Err(format!("No options allowed on {}", parsed))
@@ -31,7 +31,7 @@ impl SubTest for TestCat {
false
}
fn run(&self, func: Cow<Function>, context: &Context) -> STResult<()> {
fn run(&self, func: Cow<Function>, context: &Context) -> SubtestResult<()> {
subtest::run_filecheck(&func.display(context.isa).to_string(), context)
}
}

View File

@@ -8,12 +8,12 @@ use std::borrow::Cow;
use cretonne_codegen::cfg_printer::CFGPrinter;
use cretonne_codegen::ir::Function;
use cretonne_reader::TestCommand;
use subtest::{self, Context, SubTest, SubtestResult as STResult};
use subtest::{self, Context, SubTest, SubtestResult};
/// Object implementing the `test print-cfg` sub-test.
struct TestPrintCfg;
pub fn subtest(parsed: &TestCommand) -> STResult<Box<SubTest>> {
pub fn subtest(parsed: &TestCommand) -> SubtestResult<Box<SubTest>> {
assert_eq!(parsed.command, "print-cfg");
if !parsed.options.is_empty() {
Err(format!("No options allowed on {}", parsed))
@@ -31,7 +31,7 @@ impl SubTest for TestPrintCfg {
false
}
fn run(&self, func: Cow<Function>, context: &Context) -> STResult<()> {
fn run(&self, func: Cow<Function>, context: &Context) -> SubtestResult<()> {
subtest::run_filecheck(&CFGPrinter::new(&func).to_string(), context)
}
}