Remove dependency on rustfmt installation for consumers

CHANGELOG.adoc

@@ -13,6 +13,25 @@
 
 == Unreleased changes (release date TBD)
 
+Breaking change: this release removes the `ToString` implementation for
+`TypeSpace` and the `rustfmt-wrapper` dependency. This allows users to use a
+pretty printing method of choice. Users can use the `ToTokens` implementation of
+`TypeSpace`:
+
+Before:
+[source,rust]
+----
+let typespace = TypeSpace::default();
+typespace.to_string()
+----
+
+After:
+[source,rust]
+----
+let typespace = TypeSpace::default();
+typespace.to_stream().to_string()
+----
+
 https://github.com/oxidecomputer/typify/compare/v0.0.10\...HEAD[Full list of commits]
 
 * Allow per-type renames and derive macro applications (#131)

cargo-typify/src/lib.rs

@@ -99,7 +99,7 @@ pub fn convert(args: &CliArgs) -> Result<String> {
 use serde::{Deserialize, Serialize};
 ";
 
-    let contents = format!("{intro}\n{}", type_space.to_string());
+    let contents = format!("{intro}\n{}", type_space.to_stream().to_string());
 
     let contents = rustfmt_wrapper::rustfmt(contents).wrap_err("Failed to format Rust code")?;
 

cargo-typify/tests/integration.rs

@@ -1,5 +1,5 @@
 use expectorate::assert_contents;
-use newline_converter::{dos2unix, unix2dos};
+use newline_converter::dos2unix;
 use tempdir::TempDir;
 
 #[test]

example-build/Cargo.toml

@@ -9,6 +9,8 @@ serde = "1.0"
 serde_json = "1.0.94"
 
 [build-dependencies]
+rustfmt-wrapper = "0.2"
 schemars = "0.8"
 serde_json = "1.0.94"
+syn = "1"
 typify = { path = "../typify" }

example-build/build.rs

@@ -18,7 +18,7 @@ fn main() {
     let contents = format!(
         "{}\n{}",
         "use serde::{Deserialize, Serialize};",
-        type_space.to_string()
+        rustfmt_wrapper::rustfmt(type_space.to_stream().to_string()).unwrap()
     );
 
     let mut out_file = Path::new(&env::var("OUT_DIR").unwrap()).to_path_buf();

typify-impl/Cargo.toml

@@ -14,7 +14,6 @@ log = "0.4"
 proc-macro2 = "1.0"
 quote = "1.0"
 regress = "0.5.0"
-rustfmt-wrapper = "0.2"
 schemars = "0.8.12"
 serde_json = "1.0"
 syn = { version = "1.0", features = ["full"] }
@@ -24,6 +23,7 @@ unicode-ident = "1.0.8"
 [dev-dependencies]
 expectorate = "1.0"
 paste = "1.0"
+rustfmt-wrapper = "0.2"
 schema = "0.0.1"
 schemars = { version = "0.8.12", features = ["uuid1"] }
 serde = "1.0"

typify-impl/src/lib.rs

@@ -7,7 +7,6 @@ use log::info;
 use output::OutputSpace;
 use proc_macro2::TokenStream;
 use quote::{quote, ToTokens};
-use rustfmt_wrapper::rustfmt;
 use schemars::schema::{Metadata, Schema};
 use thiserror::Error;
 use type_entry::{
@@ -801,12 +800,6 @@ impl TypeSpace {
     }
 }
 
-impl ToString for TypeSpace {
-    fn to_string(&self) -> String {
-        rustfmt(self.to_stream().to_string()).unwrap()
-    }
-}
-
 impl ToTokens for TypeSpace {
     fn to_tokens(&self, tokens: &mut TokenStream) {
         tokens.extend(self.to_stream())

typify-test/Cargo.toml

@@ -11,6 +11,7 @@ serde_json = "1.0.94"
 
 [build-dependencies]
 ipnetwork = { version = "0.20.0", features = ["schemars"] }
+rustfmt-wrapper = "0.2"
 schemars = "0.8.12"
 serde = "1.0.155"
 typify = { path = "../typify" }

typify-test/build.rs

@@ -109,7 +109,7 @@ fn main() {
     let contents = format!(
         "{}\n{}",
         "use serde::{Deserialize, Serialize};",
-        type_space.to_string()
+        rustfmt_wrapper::rustfmt(type_space.to_stream().to_string()).unwrap()
     );
 
     let mut out_file = Path::new(&env::var("OUT_DIR").unwrap()).to_path_buf();