Merge pull request #16 from golemcloud/replace_to_string_with_display

replace ToString with Display

Author: senia-psm

src/rust/model_gen.rs

@@ -407,7 +407,7 @@ pub fn model_gen(reference: &str, open_api: &OpenAPI, ref_cache: &mut RefCache)
                     fn make_match_case(enum_name: &str, name: &str) -> RustPrinter {
                         let rust_name = name.to_case(Case::UpperCamel);
 
-                        line(unit() + enum_name + "::" + rust_name + r#" => ""# + name + r#"".to_string(),"#)
+                        line(unit() + enum_name + "::" + rust_name + r#" => write!(f, ""# + name + r#""),"#)
                     }
 
                     let match_cases = string_type
@@ -418,27 +418,25 @@ pub fn model_gen(reference: &str, open_api: &OpenAPI, ref_cache: &mut RefCache)
                         .unwrap_or_else(unit);
 
                     #[rustfmt::skip]
-                        let code = unit() +
+                    let code = unit() +
                         derive_line() +
                         line(unit() + "pub enum " + &name + " {") +
                         indented(
                             cases
                         ) +
                         line(unit() + "}") +
                         NewLine +
-                        line(unit() + "#[allow(clippy::to_string_trait_impl)]") +
-                        NewLine +
-                        line(unit() + "impl ToString for " + &name + "{") +
+                        line(unit() + "impl " + rust_name("std::fmt", "Display") + " for " + &name + "{") +
                         indented(
-                            line("fn to_string(&self) -> String {") +
+                            line(unit() + "fn fmt(&self, f: &mut " + rust_name("std::fmt", "Formatter") + "<'_>) -> " + rust_name("std::fmt", "Result") + " {") +
+                            indented(
+                                line("match self {") +
                                 indented(
-                                    line("match self {") +
-                                        indented(
-                                            match_cases
-                                        ) +
-                                        line("}")
+                                    match_cases
                                 ) +
                                 line("}")
+                            ) +
+                            line("}")
                         ) +
                         line("}");
 

src/rust/printer.rs

@@ -15,6 +15,7 @@
 use crate::printer::{IndentContext, NewLine, PrintContext, Printer, TreePrinter};
 use itertools::Itertools;
 use std::collections::HashSet;
+use std::fmt::Display;
 use std::ops::Add;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -42,18 +43,17 @@ impl RustContext {
     }
 }
 
-#[allow(clippy::to_string_trait_impl)]
-impl ToString for RustContext {
+impl Display for RustContext {
     #[allow(unstable_name_collisions)]
-    fn to_string(&self) -> String {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let RustContext {
             imports,
             code,
             depth: _,
         } = self;
 
         if imports.is_empty() {
-            code.to_string()
+            write!(f, "{}", code)
         } else {
             let imports: String = imports
                 .iter()
@@ -62,7 +62,7 @@ impl ToString for RustContext {
                 .intersperse("\n".to_string())
                 .collect();
 
-            format!("{imports}\n\n{code}")
+            write!(f, "{imports}\n\n{code}")
         }
     }
 }

src/rust/types.rs

@@ -21,6 +21,7 @@ use openapiv3::{
     AdditionalProperties, IntegerFormat, ReferenceOr, Schema, SchemaKind, StringFormat, Type,
     VariantOrUnknownOrEmpty,
 };
+use std::fmt::Display;
 
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ModelType {
@@ -42,19 +43,19 @@ pub enum IntFormat {
     I64,
 }
 
-#[allow(clippy::to_string_trait_impl)]
-impl ToString for IntFormat {
-    fn to_string(&self) -> String {
-        match self {
-            IntFormat::U8 => "u8".to_string(),
-            IntFormat::U16 => "u16".to_string(),
-            IntFormat::U32 => "u32".to_string(),
-            IntFormat::U64 => "u64".to_string(),
-            IntFormat::I8 => "i8".to_string(),
-            IntFormat::I16 => "i16".to_string(),
-            IntFormat::I32 => "i32".to_string(),
-            IntFormat::I64 => "i64".to_string(),
-        }
+impl Display for IntFormat {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let str = match self {
+            IntFormat::U8 => "u8",
+            IntFormat::U16 => "u16",
+            IntFormat::U32 => "u32",
+            IntFormat::U64 => "u64",
+            IntFormat::I8 => "i8",
+            IntFormat::I16 => "i16",
+            IntFormat::I32 => "i32",
+            IntFormat::I64 => "i64",
+        };
+        write!(f, "{}", str)
     }
 }