style: cargo fmt

ilbertt · ilbertt · commit 0cb000356fd9 · 2025-09-15T12:53:29.000+02:00
diff --git a/src/core/generate/rs/src/bindings/javascript.rs b/src/core/generate/rs/src/bindings/javascript.rs
@@ -310,4 +310,4 @@ pub fn compile(env: &TypeEnv, actor: &Option<Type>) -> String {
             result.pretty(LINE_WIDTH).to_string()
         }
     }
-}
+}
diff --git a/src/core/generate/rs/src/bindings/typescript_native/comments.rs b/src/core/generate/rs/src/bindings/typescript_native/comments.rs
@@ -1,7 +1,7 @@
 use super::conversion_functions_generator::TopLevelNodes;
 use swc_core::common::{
+    BytePos, DUMMY_SP, Span,
     comments::{Comment, CommentKind},
-    BytePos, Span, DUMMY_SP,
 };
 
 // Simple monotonic position source for synthetic spans
diff --git a/src/core/generate/rs/src/bindings/typescript_native/compile.rs b/src/core/generate/rs/src/bindings/typescript_native/compile.rs
@@ -1,7 +1,7 @@
 use super::compile_interface::compile_interface;
 use super::compile_wrapper::compile_wrapper;
-use candid_parser::syntax::IDLMergedProg;
 use candid::types::{Type, TypeEnv};
+use candid_parser::syntax::IDLMergedProg;
 
 pub fn compile(
     env: &TypeEnv,
diff --git a/src/core/generate/rs/src/bindings/typescript_native/compile_interface.rs b/src/core/generate/rs/src/bindings/typescript_native/compile_interface.rs
@@ -2,15 +2,15 @@ use super::conversion_functions_generator::TypeConverter;
 use super::new_typescript_native_types::{add_type_definitions, create_interface_from_service};
 use super::preamble::imports::interface_imports;
 use super::preamble::options::interface_options_utils;
+use super::utils::EnumDeclarations;
 use super::utils::get_ident_guarded;
 use super::utils::render_ast;
-use super::utils::EnumDeclarations;
 use crate::bindings::typescript_native::comments::add_comments;
-use candid_parser::syntax::{IDLMergedProg, IDLType};
 use candid::types::{Type, TypeEnv, TypeInner};
+use candid_parser::syntax::{IDLMergedProg, IDLType};
 use std::collections::HashMap;
-use swc_core::common::Span;
 use swc_core::common::DUMMY_SP;
+use swc_core::common::Span;
 use swc_core::ecma::ast::*;
 
 pub fn compile_interface(
diff --git a/src/core/generate/rs/src/bindings/typescript_native/compile_wrapper.rs b/src/core/generate/rs/src/bindings/typescript_native/compile_wrapper.rs
@@ -1,9 +1,9 @@
 use super::conversion_functions_generator::TypeConverter;
 use super::utils::{contains_unicode_characters, get_ident_guarded, get_ident_guarded_keyword_ok};
-use candid_parser::syntax::IDLMergedProg;
 use candid::types::internal::TypeKey;
 use candid::types::{Function, Type, TypeEnv, TypeInner};
-use swc_core::common::{SyntaxContext, DUMMY_SP};
+use candid_parser::syntax::IDLMergedProg;
+use swc_core::common::{DUMMY_SP, SyntaxContext};
 use swc_core::ecma::ast::*;
 
 use super::conversion_functions_generator::convert_multi_return_from_candid;
@@ -12,7 +12,7 @@ use super::new_typescript_native_types::convert_type_with_converter;
 use super::new_typescript_native_types::add_type_definitions;
 use super::preamble::imports::wrapper_imports;
 use super::preamble::options::{interface_options_utils, wrapper_options_utils};
-use super::utils::{render_ast, EnumDeclarations};
+use super::utils::{EnumDeclarations, render_ast};
 
 use super::comments::add_comments;
 use super::compile_interface::{interface_actor_service, interface_actor_var};
diff --git a/src/core/generate/rs/src/bindings/typescript_native/conversion_functions_generator.rs b/src/core/generate/rs/src/bindings/typescript_native/conversion_functions_generator.rs
@@ -1,10 +1,10 @@
 use super::comments::PosCursor;
 use super::new_typescript_native_types::{convert_type_with_converter, is_recursive_optional};
 use super::original_typescript_types::OriginalTypescriptTypes;
-use super::utils::{contains_unicode_characters, get_ident_guarded, EnumDeclarations};
+use super::utils::{EnumDeclarations, contains_unicode_characters, get_ident_guarded};
 use candid::types::{Field, Label, Type, TypeEnv, TypeInner};
 use std::collections::{HashMap, HashSet};
-use swc_core::common::{comments::SingleThreadedComments, SyntaxContext, DUMMY_SP};
+use swc_core::common::{DUMMY_SP, SyntaxContext, comments::SingleThreadedComments};
 use swc_core::ecma::ast::*;
 // Type aliases to simplify complex types used throughout this module
 
@@ -265,9 +265,7 @@ impl<'a> TypeConverter<'a> {
             TypeInner::Opt(inner) => self.convert_opt_to_candid_body(inner, param_name),
             TypeInner::Vec(inner) => self.convert_vec_to_candid_body(inner, param_name),
             TypeInner::Record(fields) => self.convert_record_to_candid_body(fields, param_name),
-            TypeInner::Variant(fields) => {
-                self.convert_variant_to_candid_body(fields, param_name)
-            }
+            TypeInner::Variant(fields) => self.convert_variant_to_candid_body(fields, param_name),
             TypeInner::Func(func) => self.convert_func_to_candid_body(func, param_name),
             TypeInner::Service(_) => self.create_ident(param_name), // Pass through as-is
             TypeInner::Var(id) => {
@@ -961,12 +959,8 @@ impl<'a> TypeConverter<'a> {
             TypeInner::Principal => self.convert_principal_from_candid_body(param_name),
             TypeInner::Opt(inner) => self.convert_opt_from_candid_body(inner, param_name),
             TypeInner::Vec(inner) => self.convert_vec_from_candid_body(inner, param_name),
-            TypeInner::Record(fields) => {
-                self.convert_record_from_candid_body(fields, param_name)
-            }
-            TypeInner::Variant(fields) => {
-                self.convert_variant_from_candid_body(fields, param_name)
-            }
+            TypeInner::Record(fields) => self.convert_record_from_candid_body(fields, param_name),
+            TypeInner::Variant(fields) => self.convert_variant_from_candid_body(fields, param_name),
             TypeInner::Func(func) => self.convert_func_from_candid_body(func, param_name),
             TypeInner::Service(_) => self.create_ident(param_name), // Pass through as-is
             TypeInner::Var(id) => {
diff --git a/src/core/generate/rs/src/bindings/typescript_native/new_typescript_native_types.rs b/src/core/generate/rs/src/bindings/typescript_native/new_typescript_native_types.rs
@@ -2,10 +2,10 @@ use super::super::javascript::is_tuple;
 use super::comments::add_comments;
 use super::conversion_functions_generator::{TopLevelNodes, TypeConverter};
 use super::utils::{get_ident_guarded, get_ident_guarded_keyword_ok};
-use candid_parser::syntax::{self, IDLMergedProg, IDLType};
 use candid::types::{Field, Function, Label, Type, TypeEnv, TypeInner};
+use candid_parser::syntax::{self, IDLMergedProg, IDLType};
 use swc_core::common::Span;
-use swc_core::common::{SyntaxContext, DUMMY_SP};
+use swc_core::common::{DUMMY_SP, SyntaxContext};
 use swc_core::ecma::ast::*;
 
 // Helper function to determine if a type is recursively optional
@@ -67,23 +67,21 @@ pub fn create_interface_from_service(
                 TypeInner::Func(func) => {
                     create_method_signature(top_level_nodes, env, method_id, func, span)
                 }
-                TypeInner::Var(var_id) => {
-                    TsTypeElement::TsPropertySignature(TsPropertySignature {
-                        span,
-                        key: Box::new(Expr::Ident(get_ident_guarded(method_id))),
-                        computed: false,
-                        optional: false,
-                        readonly: false,
-                        type_ann: Some(Box::new(TsTypeAnn {
+                TypeInner::Var(var_id) => TsTypeElement::TsPropertySignature(TsPropertySignature {
+                    span,
+                    key: Box::new(Expr::Ident(get_ident_guarded(method_id))),
+                    computed: false,
+                    optional: false,
+                    readonly: false,
+                    type_ann: Some(Box::new(TsTypeAnn {
+                        span: DUMMY_SP,
+                        type_ann: Box::new(TsType::TsTypeRef(TsTypeRef {
                             span: DUMMY_SP,
-                            type_ann: Box::new(TsType::TsTypeRef(TsTypeRef {
-                                span: DUMMY_SP,
-                                type_name: TsEntityName::Ident(get_ident_guarded(var_id.as_str())),
-                                type_params: None,
-                            })),
+                            type_name: TsEntityName::Ident(get_ident_guarded(var_id.as_str())),
+                            type_params: None,
                         })),
-                    })
-                }
+                    })),
+                }),
                 _ => unreachable!(),
             }
         })
diff --git a/src/core/generate/rs/src/bindings/typescript_native/original_typescript_types.rs b/src/core/generate/rs/src/bindings/typescript_native/original_typescript_types.rs
@@ -1,7 +1,7 @@
 use candid::types::internal::TypeKey;
 use candid::types::{Field, Label, Type, TypeEnv, TypeInner};
 use std::collections::HashSet;
-use swc_core::common::{SyntaxContext, DUMMY_SP};
+use swc_core::common::{DUMMY_SP, SyntaxContext};
 use swc_core::ecma::ast::*;
 
 use super::utils::get_ident_guarded_keyword_ok;
diff --git a/src/core/generate/rs/src/bindings/typescript_native/preamble/imports.rs b/src/core/generate/rs/src/bindings/typescript_native/preamble/imports.rs
@@ -1,4 +1,4 @@
-use swc_core::common::{SyntaxContext, DUMMY_SP};
+use swc_core::common::{DUMMY_SP, SyntaxContext};
 use swc_core::ecma::ast::*;
 
 pub fn interface_imports(module: &mut Module, service_name: &str) {
diff --git a/src/core/generate/rs/src/bindings/typescript_native/preamble/options.rs b/src/core/generate/rs/src/bindings/typescript_native/preamble/options.rs
@@ -1,4 +1,4 @@
-use swc_core::common::{SyntaxContext, DUMMY_SP};
+use swc_core::common::{DUMMY_SP, SyntaxContext};
 use swc_core::ecma::ast::*;
 
 pub fn interface_options_utils(module: &mut Module) {
diff --git a/src/core/generate/rs/src/bindings/typescript_native/utils.rs b/src/core/generate/rs/src/bindings/typescript_native/utils.rs
@@ -6,7 +6,7 @@ use swc_core::common::sync::Lrc;
 use swc_core::ecma::ast::TsEnumDecl;
 use swc_core::ecma::{
     ast::Module,
-    codegen::{text_writer::JsWriter, text_writer::WriteJs, Config, Emitter},
+    codegen::{Config, Emitter, text_writer::JsWriter, text_writer::WriteJs},
 };
 
 pub type EnumDeclarations = HashMap<Vec<Field>, (TsEnumDecl, String)>;
@@ -183,7 +183,7 @@ impl<W: WriteJs> WriteJs for NewlineAfterBlockComments<W> {
     }
 }
 
-use swc_core::common::{SyntaxContext, DUMMY_SP};
+use swc_core::common::{DUMMY_SP, SyntaxContext};
 use swc_core::ecma::ast::*;
 
 pub static KEYWORDS: [&str; 125] = [
diff --git a/src/core/generate/rs/src/lib.rs b/src/core/generate/rs/src/lib.rs
@@ -1,6 +1,6 @@
+mod bindings;
 mod fs;
 mod parser;
-mod bindings;
 
 use std::path::PathBuf;
 
@@ -34,21 +34,11 @@ pub fn generate(declarations: String, service_name: String) -> Result<GenerateRe
     let declarations_js = javascript::compile(&env, &actor);
     let declarations_ts = typescript::compile(&env, &actor, &prog);
 
-    let interface_ts = typescript_native::compile::compile(
-        &env,
-        &actor,
-        &service_name,
-        "interface",
-        &prog,
-    );
-
-    let service_ts = typescript_native::compile::compile(
-        &env,
-        &actor,
-        &service_name,
-        "wrapper",
-        &prog,
-    );
+    let interface_ts =
+        typescript_native::compile::compile(&env, &actor, &service_name, "interface", &prog);
+
+    let service_ts =
+        typescript_native::compile::compile(&env, &actor, &service_name, "wrapper", &prog);
 
     Ok(GenerateResult {
         declarations_js,

Original file line number	Diff line number	Diff line change
`@@ -310,4 +310,4 @@ pub fn compile(env: &TypeEnv, actor: &Option<Type>) -> String {`
`310`	`310`	`result.pretty(LINE_WIDTH).to_string()`
`311`	`311`	`}`
`312`	`312`	`}`
`313`		`-}`
	`313`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use swc_core::common::{SyntaxContext, DUMMY_SP};`
	`1`	`+use swc_core::common::{DUMMY_SP, SyntaxContext};`
`2`	`2`	`use swc_core::ecma::ast::*;`
`3`	`3`
`4`	`4`	`pub fn interface_imports(module: &mut Module, service_name: &str) {`