From ad9a942f5266a76eef3d458f1915f6dfb699f1c8 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Wed, 10 May 2017 14:58:14 -0700
Subject: [PATCH] Use write! in utility code, rather than calling
 write_function directly.

---
 cranelift/src/filetest/legalizer.rs | 5 +++--
 cranelift/src/filetest/regalloc.rs  | 5 +++--
 cranelift/src/utils.rs              | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cranelift/src/filetest/legalizer.rs b/cranelift/src/filetest/legalizer.rs
index 8fd7f45b16..aa6385c223 100644
--- a/cranelift/src/filetest/legalizer.rs
+++ b/cranelift/src/filetest/legalizer.rs
@@ -4,10 +4,11 @@
 //! the result to filecheck.
 
 use std::borrow::Cow;
-use cretonne::{self, write_function};
+use cretonne::{self};
 use cretonne::ir::Function;
 use cton_reader::TestCommand;
 use filetest::subtest::{SubTest, Context, Result, run_filecheck};
+use std::fmt::Write;
 use utils::pretty_error;
 
 struct TestLegalizer;
@@ -45,7 +46,7 @@ impl SubTest for TestLegalizer {
             .map_err(|e| pretty_error(&comp_ctx.func, e))?;
 
         let mut text = String::new();
-        write_function(&mut text, &comp_ctx.func, Some(isa))
+        write!(&mut text, "{}", &comp_ctx.func.display(Some(isa)))
             .map_err(|e| e.to_string())?;
         run_filecheck(&text, context)
     }
diff --git a/cranelift/src/filetest/regalloc.rs b/cranelift/src/filetest/regalloc.rs
index 79e7ad8e0f..4173b7c3d8 100644
--- a/cranelift/src/filetest/regalloc.rs
+++ b/cranelift/src/filetest/regalloc.rs
@@ -6,10 +6,11 @@
 //! The resulting function is sent to `filecheck`.
 
 use cretonne::ir::Function;
-use cretonne::{self, write_function};
+use cretonne::{self};
 use cton_reader::TestCommand;
 use filetest::subtest::{SubTest, Context, Result, run_filecheck};
 use std::borrow::Cow;
+use std::fmt::Write;
 use utils::pretty_error;
 
 struct TestRegalloc;
@@ -53,7 +54,7 @@ impl SubTest for TestRegalloc {
             .map_err(|e| pretty_error(&comp_ctx.func, e))?;
 
         let mut text = String::new();
-        write_function(&mut text, &comp_ctx.func, Some(isa))
+        write!(&mut text, "{}", &comp_ctx.func.display(Some(isa)))
             .map_err(|e| e.to_string())?;
         run_filecheck(&text, context)
     }
diff --git a/cranelift/src/utils.rs b/cranelift/src/utils.rs
index 1bcba4891a..b637f7ca49 100644
--- a/cranelift/src/utils.rs
+++ b/cranelift/src/utils.rs
@@ -1,7 +1,7 @@
 //! Utility functions.
 
 use cretonne::ir::entities::AnyEntity;
-use cretonne::{ir, verifier, write_function};
+use cretonne::{ir, verifier};
 use cretonne::result::CtonError;
 use std::fmt::Write;
 use std::fs::File;
@@ -42,7 +42,7 @@ pub fn pretty_verifier_error(func: &ir::Function, err: verifier::Error) -> Strin
         }
         _ => msg.push('\n'),
     }
-    write_function(&mut msg, func, None).unwrap();
+    write!(msg, "{}", func).unwrap();
     msg
 }