Remove rustfmt from progenitor-impl

oxidecomputer · Apr 25, 2023 · 25b07ab · 25b07ab
1 parent 7da8db8
commit 25b07ab
Show file tree

Hide file tree

Showing 16 changed files with 214 additions and 92 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/example-build/Cargo.toml b/example-build/Cargo.toml
@@ -14,5 +14,7 @@ serde = { version = "1.0", features = ["derive"] }
 uuid = { version = "1.3", features = ["serde", "v4"] }
 
 [build-dependencies]
+prettyplease = "0.1.25"
 progenitor = { path = "../progenitor" }
 serde_json = "1.0"
+syn = "1.0"
diff --git a/example-build/build.rs b/example-build/build.rs
@@ -13,7 +13,9 @@ fn main() {
     let spec = serde_json::from_reader(file).unwrap();
     let mut generator = progenitor::Generator::default();
 
-    let content = generator.generate_text(&spec).unwrap();
+    let tokens = generator.generate_tokens(&spec).unwrap();
+    let ast = syn::parse2(tokens).unwrap();
+    let content = prettyplease::unparse(&ast);
 
     let mut out_file = Path::new(&env::var("OUT_DIR").unwrap()).to_path_buf();
     out_file.push("codegen.rs");

diff --git a/progenitor-impl/Cargo.toml b/progenitor-impl/Cargo.toml
@@ -16,7 +16,6 @@ openapiv3 = "1.0.0"
 proc-macro2 = "1.0"
 quote = "1.0"
 regex = "1.8"
-rustfmt-wrapper = "0.2.0"
 schemars = { version = "0.8.12", features = ["chrono", "uuid1"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -32,5 +31,6 @@ dropshot = { git = "https://github.com/oxidecomputer/dropshot", default-features
 expectorate = "1.0"
 http = "0.2.9"
 hyper = "0.14.26"
+rustfmt-wrapper = "0.2.0"
 serde_yaml = "0.9"
 serde_json = "1.0.96"
diff --git a/progenitor-impl/src/cli.rs b/progenitor-impl/src/cli.rs
@@ -10,7 +10,6 @@ use crate::{
     method::{
         OperationParameterKind, OperationParameterType, OperationResponseStatus,
     },
-    space_out_items,
     to_schema::ToSchema,
     util::{sanitize, Case},
     validate_openapi, Generator, Result,
@@ -23,25 +22,6 @@ struct CliOperation {
 }
 
 impl Generator {
-    pub fn cli_text(
-        &mut self,
-        spec: &OpenAPI,
-        crate_name: &str,
-    ) -> Result<String> {
-        let output = self.cli(spec, crate_name)?;
-
-        let content = rustfmt_wrapper::rustfmt_config(
-            rustfmt_wrapper::config::Config {
-                format_strings: Some(true),
-                ..Default::default()
-            },
-            output,
-        )
-        .unwrap();
-
-        space_out_items(content)
-    }
-
     /// Generate a `clap`-based CLI.
     pub fn cli(
         &mut self,

diff --git a/progenitor-impl/src/lib.rs b/progenitor-impl/src/lib.rs
@@ -506,41 +506,7 @@ impl Generator {
 
     /// Render text output.
     pub fn generate_text(&mut self, spec: &OpenAPI) -> Result<String> {
-        self.generate_text_impl(
-            spec,
-            rustfmt_wrapper::config::Config::default(),
-        )
-    }
-
-    /// Render text output and normalize doc comments
-    ///
-    /// Requires a nightly install of `rustfmt` (even if the target project is
-    /// not using nightly).
-    pub fn generate_text_normalize_comments(
-        &mut self,
-        spec: &OpenAPI,
-    ) -> Result<String> {
-        self.generate_text_impl(
-            spec,
-            rustfmt_wrapper::config::Config {
-                normalize_doc_attributes: Some(true),
-                wrap_comments: Some(true),
-                ..Default::default()
-            },
-        )
-    }
-
-    fn generate_text_impl(
-        &mut self,
-        spec: &OpenAPI,
-        config: rustfmt_wrapper::config::Config,
-    ) -> Result<String> {
-        let output = self.generate_tokens(spec)?;
-
-        // Format the file with rustfmt.
-        let content = rustfmt_wrapper::rustfmt_config(config, output).unwrap();
-
-        space_out_items(content)
+        Ok(self.generate_tokens(spec)?.to_string())
     }
 
     // TODO deprecate?

diff --git a/progenitor-impl/src/to_schema.rs b/progenitor-impl/src/to_schema.rs
@@ -89,7 +89,7 @@ impl Convert<schemars::schema::Schema> for openapiv3::Schema {
 
         // 2. It can be used within a oneOf or anyOf schema to determine which
         // subschema is relevant. This is easier to detect because it doesn't
-        // required chasing references. For each subschema we can then make it
+        // require chasing references. For each subschema we can then make it
         // an allOf union of the actual subschema along with a fixed-field
         // structure.
 

diff --git a/progenitor-impl/tests/output/nexus-builder-tagged.out b/progenitor-impl/tests/output/nexus-builder-tagged.out
@@ -2510,7 +2510,20 @@ pub mod types {
     impl std::str::FromStr for Ipv4Net {
         type Err = &'static str;
         fn from_str(value: &str) -> Result<Self, &'static str> {
-            if regress :: Regex :: new ("^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/([8-9]|1[0-9]|2[0-9]|3[0-2])$") . unwrap () . find (value) . is_none () { return Err ("doesn't match pattern \"^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/([8-9]|1[0-9]|2[0-9]|3[0-2])$\"") ; }
+            if regress::Regex::new(
+                "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.\
+                 ){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/\
+                 ([8-9]|1[0-9]|2[0-9]|3[0-2])$",
+            )
+            .unwrap()
+            .find(value)
+            .is_none()
+            {
+                return Err("doesn't match pattern \
+                            \"^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.\
+                            ){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/\
+                            ([8-9]|1[0-9]|2[0-9]|3[0-2])$\"");
+            }
             Ok(Self(value.to_string()))
         }
     }
@@ -2593,7 +2606,19 @@ pub mod types {
     impl std::str::FromStr for Ipv6Net {
         type Err = &'static str;
         fn from_str(value: &str) -> Result<Self, &'static str> {
-            if regress :: Regex :: new ("^([fF][dD])[0-9a-fA-F]{2}:(([0-9a-fA-F]{1,4}:){6}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,6}:)\\/([1-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])$") . unwrap () . find (value) . is_none () { return Err ("doesn't match pattern \"^([fF][dD])[0-9a-fA-F]{2}:(([0-9a-fA-F]{1,4}:){6}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,6}:)\\/([1-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])$\"") ; }
+            if regress::Regex::new(
+                "^([fF][dD])[0-9a-fA-F]{2}:(([0-9a-fA-F]{1,4}:){6}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,\
+                 4}:){1,6}:)\\/([1-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])$",
+            )
+            .unwrap()
+            .find(value)
+            .is_none()
+            {
+                return Err("doesn't match pattern \
+                            \"^([fF][dD])[0-9a-fA-F]{2}:(([0-9a-fA-F]{1,4}:){6}[0-9a-fA-F]{1,\
+                            4}|([0-9a-fA-F]{1,4}:){1,6}:)\\/\
+                            ([1-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])$\"");
+            }
             Ok(Self(value.to_string()))
         }
     }
@@ -5241,7 +5266,9 @@ pub mod types {
             .find(value)
             .is_none()
             {
-                return Err ("doesn't match pattern \"(([a-z]+[a-z0-9]*)(_([a-z0-9]+))*):(([a-z]+[a-z0-9]*)(_([a-z0-9]+))*)\"") ;
+                return Err("doesn't match pattern \
+                            \"(([a-z]+[a-z0-9]*)(_([a-z0-9]+))*):(([a-z]+[a-z0-9]*\
+                            )(_([a-z0-9]+))*)\"");
             }
             Ok(Self(value.to_string()))
         }
@@ -23979,7 +24006,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . end_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for end_time failed" . to_string ()) ;
+            self.end_time = value.try_into().map(Some).map_err(|_| {
+                "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for end_time failed"
+                    .to_string()
+            });
             self
         }
 
@@ -24008,7 +24038,11 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . start_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for start_time failed" . to_string ()) ;
+            self.start_time = value.try_into().map(Some).map_err(|_| {
+                "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for start_time \
+                 failed"
+                    .to_string()
+            });
             self
         }
 
@@ -34202,7 +34236,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . end_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for end_time failed" . to_string ()) ;
+            self.end_time = value.try_into().map(Some).map_err(|_| {
+                "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for end_time failed"
+                    .to_string()
+            });
             self
         }
 
@@ -34241,7 +34278,11 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . start_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for start_time failed" . to_string ()) ;
+            self.start_time = value.try_into().map(Some).map_err(|_| {
+                "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for start_time \
+                 failed"
+                    .to_string()
+            });
             self
         }
 

diff --git a/progenitor-impl/tests/output/nexus-builder.out b/progenitor-impl/tests/output/nexus-builder.out
@@ -2530,7 +2530,20 @@ pub mod types {
     impl std::str::FromStr for Ipv4Net {
         type Err = &'static str;
         fn from_str(value: &str) -> Result<Self, &'static str> {
-            if regress :: Regex :: new ("^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/([8-9]|1[0-9]|2[0-9]|3[0-2])$") . unwrap () . find (value) . is_none () { return Err ("doesn't match pattern \"^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/([8-9]|1[0-9]|2[0-9]|3[0-2])$\"") ; }
+            if regress::Regex::new(
+                "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.\
+                 ){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/\
+                 ([8-9]|1[0-9]|2[0-9]|3[0-2])$",
+            )
+            .unwrap()
+            .find(value)
+            .is_none()
+            {
+                return Err("doesn't match pattern \
+                            \"^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.\
+                            ){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/\
+                            ([8-9]|1[0-9]|2[0-9]|3[0-2])$\"");
+            }
             Ok(Self(value.to_string()))
         }
     }
@@ -2613,7 +2626,19 @@ pub mod types {
     impl std::str::FromStr for Ipv6Net {
         type Err = &'static str;
         fn from_str(value: &str) -> Result<Self, &'static str> {
-            if regress :: Regex :: new ("^([fF][dD])[0-9a-fA-F]{2}:(([0-9a-fA-F]{1,4}:){6}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,6}:)\\/([1-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])$") . unwrap () . find (value) . is_none () { return Err ("doesn't match pattern \"^([fF][dD])[0-9a-fA-F]{2}:(([0-9a-fA-F]{1,4}:){6}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,6}:)\\/([1-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])$\"") ; }
+            if regress::Regex::new(
+                "^([fF][dD])[0-9a-fA-F]{2}:(([0-9a-fA-F]{1,4}:){6}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,\
+                 4}:){1,6}:)\\/([1-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])$",
+            )
+            .unwrap()
+            .find(value)
+            .is_none()
+            {
+                return Err("doesn't match pattern \
+                            \"^([fF][dD])[0-9a-fA-F]{2}:(([0-9a-fA-F]{1,4}:){6}[0-9a-fA-F]{1,\
+                            4}|([0-9a-fA-F]{1,4}:){1,6}:)\\/\
+                            ([1-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])$\"");
+            }
             Ok(Self(value.to_string()))
         }
     }
@@ -5283,7 +5308,9 @@ pub mod types {
             .find(value)
             .is_none()
             {
-                return Err ("doesn't match pattern \"(([a-z]+[a-z0-9]*)(_([a-z0-9]+))*):(([a-z]+[a-z0-9]*)(_([a-z0-9]+))*)\"") ;
+                return Err("doesn't match pattern \
+                            \"(([a-z]+[a-z0-9]*)(_([a-z0-9]+))*):(([a-z]+[a-z0-9]*\
+                            )(_([a-z0-9]+))*)\"");
             }
             Ok(Self(value.to_string()))
         }
@@ -23771,7 +23798,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . end_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for end_time failed" . to_string ()) ;
+            self.end_time = value.try_into().map(Some).map_err(|_| {
+                "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for end_time failed"
+                    .to_string()
+            });
             self
         }
 
@@ -23800,7 +23830,11 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . start_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for start_time failed" . to_string ()) ;
+            self.start_time = value.try_into().map(Some).map_err(|_| {
+                "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for start_time \
+                 failed"
+                    .to_string()
+            });
             self
         }
 
@@ -33994,7 +34028,10 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . end_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for end_time failed" . to_string ()) ;
+            self.end_time = value.try_into().map(Some).map_err(|_| {
+                "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for end_time failed"
+                    .to_string()
+            });
             self
         }
 
@@ -34033,7 +34070,11 @@ pub mod builder {
         where
             V: std::convert::TryInto<chrono::DateTime<chrono::offset::Utc>>,
         {
-            self . start_time = value . try_into () . map (Some) . map_err (| _ | "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for start_time failed" . to_string ()) ;
+            self.start_time = value.try_into().map(Some).map_err(|_| {
+                "conversion to `chrono :: DateTime < chrono :: offset :: Utc >` for start_time \
+                 failed"
+                    .to_string()
+            });
             self
         }