rust fmt

backend/rustfmt.toml

@@ -11,7 +11,7 @@ normalize_doc_attributes = true
 report_todo = "Always"
 report_fixme = "Always"
 imports_layout = "HorizontalVertical"
-merge_imports = true
+imports_granularity = "Crate"
 reorder_modules = true
 reorder_imports = true
 enum_discrim_align_threshold = 20

backend/src/config/configuration.rs

@@ -64,8 +64,7 @@ pub fn get_configuration() -> Result<Settings, config::ConfigError> {
         .try_into()
         .expect("Failed to parse APP_ENVIRONMENT.");
 
-    settings
-        .merge(config::File::from(configuration_dir.join(environment.as_str())).required(true))?;
+    settings.merge(config::File::from(configuration_dir.join(environment.as_str())).required(true))?;
 
     // Add in settings from environment variables (with a prefix of APP and '__' as
     // separator) E.g. `APP_APPLICATION__PORT=5001 would set

backend/src/service/user/auth.rs

@@ -8,7 +8,8 @@ use backend_service::{
     errors::{invalid_params, ErrorCode, ServerError},
     response::FlowyResponse,
 };
-
+#[allow(dead_code)]
+use chrono::Utc;
 use flowy_user_infra::{
     parser::{UserEmail, UserName, UserPassword},
     protobuf::{SignInParams, SignInResponse, SignUpParams, SignUpResponse, UpdateUserParams, UserProfile},

frontend/rust-lib/rustfmt.toml

@@ -11,7 +11,7 @@ normalize_doc_attributes = true
 report_todo = "Always"
 report_fixme = "Always"
 imports_layout = "HorizontalVertical"
-merge_imports = true
+imports_granularity = "Crate"
 reorder_modules = true
 reorder_imports = true
 enum_discrim_align_threshold = 20

frontend/scripts/flowy-tool/src/proto/template/derive_meta/derive_meta.tera

@@ -1,3 +1,4 @@
+#[rustfmt::skip]
 pub enum TypeCategory {
     Array,
     Map,

shared-lib/flowy-derive/src/derive_cache/derive_cache.rs

@@ -1,3 +1,4 @@
+#[rustfmt::skip]
 pub enum TypeCategory {
     Array,
     Map,
@@ -76,8 +77,7 @@ pub fn category_from_str(type_str: &str) -> TypeCategory {
         | "UserToken"
         | "UserProfile"
         | "UpdateUserRequest"
-        | "UpdateUserParams"
-        => TypeCategory::Protobuf,
+        | "UpdateUserParams" => TypeCategory::Protobuf,
         "WorkspaceEvent"
         | "WorkspaceNotification"
         | "ErrorCode"
@@ -90,8 +90,7 @@ pub fn category_from_str(type_str: &str) -> TypeCategory {
         | "ExportType"
         | "RevType"
         | "WsDataType"
-        | "WsModule"
-        => TypeCategory::Enum,
+        | "WsModule" => TypeCategory::Enum,
 
         "Option" => TypeCategory::Opt,
         _ => TypeCategory::Primitive,

shared-lib/rustfmt.toml

@@ -11,7 +11,7 @@ normalize_doc_attributes = true
 report_todo = "Always"
 report_fixme = "Always"
 imports_layout = "HorizontalVertical"
-merge_imports = true
+imports_granularity = "Crate"
 reorder_modules = true
 reorder_imports = true
 enum_discrim_align_threshold = 20