From 683880bd02a284cd917b1eb18c0cc1a4d442594e Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Tue, 12 Jun 2018 04:44:07 -0700
Subject: [PATCH] Avoid uninteresting renaming of imports.

---
 lib/filetests/src/test_cat.rs       | 6 +++---
 lib/filetests/src/test_print_cfg.rs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/filetests/src/test_cat.rs b/lib/filetests/src/test_cat.rs
index aaecb2d735..c3b1a1aa4a 100644
--- a/lib/filetests/src/test_cat.rs
+++ b/lib/filetests/src/test_cat.rs
@@ -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)
     }
 }
diff --git a/lib/filetests/src/test_print_cfg.rs b/lib/filetests/src/test_print_cfg.rs
index d211381886..5f196d6228 100644
--- a/lib/filetests/src/test_print_cfg.rs
+++ b/lib/filetests/src/test_print_cfg.rs
@@ -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)
     }
 }