Merge pull request #893 from xrelkd/chore/nix

xrelkd · web-flow · commit bf5bba44c24d · 2026-01-26T10:55:00.000+08:00
Update `flake.lock`
diff --git a/Cargo.toml b/Cargo.toml
@@ -157,108 +157,108 @@ unused_qualifications                   = "deny"
 unused_results                          = "deny"
 variant_size_differences                = "deny"
 
-ambiguous_glob_imports                   = "deny"
-ambiguous_glob_reexports                 = "deny"
-anonymous_parameters                     = "deny"
-array_into_iter                          = "deny"
-asm_sub_register                         = "deny"
-bad_asm_style                            = "deny"
-bare_trait_objects                       = "deny"
-break_with_label_and_loop                = "deny"
-clashing_extern_declarations             = "deny"
-coherence_leak_check                     = "deny"
-confusable_idents                        = "deny"
-const_evaluatable_unchecked              = "deny"
-const_item_mutation                      = "deny"
-dangling_pointers_from_temporaries       = "deny"
-dead_code                                = "deny"
-deprecated                               = "deny"
-deprecated_where_clause_location         = "deny"
-deref_into_dyn_supertrait                = "deny"
-deref_nullptr                            = "deny"
-drop_bounds                              = "deny"
-dropping_copy_types                      = "deny"
-dropping_references                      = "deny"
-duplicate_macro_attributes               = "deny"
-dyn_drop                                 = "deny"
-elided_lifetimes_in_associated_constant  = "deny"
-ellipsis_inclusive_range_patterns        = "deny"
-exported_private_dependencies            = "deny"
-for_loops_over_fallibles                 = "deny"
-forbidden_lint_groups                    = "deny"
-forgetting_copy_types                    = "deny"
-forgetting_references                    = "deny"
-function_item_references                 = "deny"
-hidden_glob_reexports                    = "deny"
-improper_ctypes                          = "deny"
-improper_ctypes_definitions              = "deny"
-incomplete_features                      = "deny"
-inline_no_sanitize                       = "deny"
-internal_features                        = "deny"
-invalid_doc_attributes                   = "deny"
-invalid_from_utf8                        = "deny"
-invalid_macro_export_arguments           = "deny"
-invalid_nan_comparisons                  = "deny"
-invalid_value                            = "deny"
-irrefutable_let_patterns                 = "deny"
-large_assignments                        = "deny"
-late_bound_lifetime_arguments            = "deny"
-legacy_derive_helpers                    = "deny"
-map_unit_fn                              = "deny"
-mixed_script_confusables                 = "deny"
-named_arguments_used_positionally        = "deny"
-no_mangle_generic_items                  = "deny"
-non_camel_case_types                     = "deny"
-non_fmt_panics                           = "deny"
-non_shorthand_field_patterns             = "deny"
-non_snake_case                           = "deny"
-non_upper_case_globals                   = "deny"
-noop_method_call                         = "deny"
-opaque_hidden_inferred_bound             = "deny"
-overlapping_range_endpoints              = "deny"
-path_statements                          = "deny"
-private_bounds                           = "deny"
-private_interfaces                       = "deny"
-redundant_semicolons                     = "deny"
-refining_impl_trait                      = { level = "deny", priority = -1 }
-renamed_and_removed_lints                = "deny"
-repr_transparent_external_private_fields = "deny"
-semicolon_in_expressions_from_macros     = "deny"
-special_module_name                      = "deny"
-stable_features                          = "deny"
-suspicious_double_ref_op                 = "deny"
-trivial_bounds                           = "deny"
-type_alias_bounds                        = "deny"
-tyvar_behind_raw_pointer                 = "deny"
-uncommon_codepoints                      = "deny"
-unconditional_recursion                  = "deny"
-unexpected_cfgs                          = "deny"
-ungated_async_fn_track_caller            = "deny"
-uninhabited_static                       = "deny"
-unknown_lints                            = "deny"
-unnameable_test_items                    = "deny"
-unreachable_code                         = "deny"
-unreachable_patterns                     = "deny"
-unstable_name_collisions                 = "deny"
-unstable_syntax_pre_expansion            = "deny"
-unused_allocation                        = "deny"
-unused_assignments                       = "deny"
-unused_associated_type_bounds            = "deny"
-unused_attributes                        = "deny"
-unused_braces                            = "deny"
-unused_comparisons                       = "deny"
-unused_doc_comments                      = "deny"
-unused_features                          = "deny"
-unused_imports                           = "deny"
-unused_labels                            = "deny"
-unused_macros                            = "deny"
-unused_must_use                          = "deny"
-unused_mut                               = "deny"
-unused_parens                            = "deny"
-unused_unsafe                            = "deny"
-unused_variables                         = "deny"
-useless_ptr_null_checks                  = "deny"
-while_true                               = "deny"
+ambiguous_glob_imports                  = "deny"
+ambiguous_glob_reexports                = "deny"
+anonymous_parameters                    = "deny"
+array_into_iter                         = "deny"
+asm_sub_register                        = "deny"
+bad_asm_style                           = "deny"
+bare_trait_objects                      = "deny"
+break_with_label_and_loop               = "deny"
+clashing_extern_declarations            = "deny"
+coherence_leak_check                    = "deny"
+confusable_idents                       = "deny"
+const_evaluatable_unchecked             = "deny"
+const_item_mutation                     = "deny"
+dangling_pointers_from_temporaries      = "deny"
+dead_code                               = "deny"
+deprecated                              = "deny"
+deprecated_where_clause_location        = "deny"
+deref_into_dyn_supertrait               = "deny"
+deref_nullptr                           = "deny"
+drop_bounds                             = "deny"
+dropping_copy_types                     = "deny"
+dropping_references                     = "deny"
+duplicate_macro_attributes              = "deny"
+dyn_drop                                = "deny"
+elided_lifetimes_in_associated_constant = "deny"
+ellipsis_inclusive_range_patterns       = "deny"
+exported_private_dependencies           = "deny"
+for_loops_over_fallibles                = "deny"
+forbidden_lint_groups                   = "deny"
+forgetting_copy_types                   = "deny"
+forgetting_references                   = "deny"
+function_item_references                = "deny"
+hidden_glob_reexports                   = "deny"
+improper_ctypes                         = "deny"
+improper_ctypes_definitions             = "deny"
+incomplete_features                     = "deny"
+inline_no_sanitize                      = "deny"
+internal_features                       = "deny"
+invalid_doc_attributes                  = "deny"
+invalid_from_utf8                       = "deny"
+invalid_macro_export_arguments          = "deny"
+invalid_nan_comparisons                 = "deny"
+invalid_value                           = "deny"
+irrefutable_let_patterns                = "deny"
+large_assignments                       = "deny"
+late_bound_lifetime_arguments           = "deny"
+legacy_derive_helpers                   = "deny"
+map_unit_fn                             = "deny"
+mixed_script_confusables                = "deny"
+named_arguments_used_positionally       = "deny"
+no_mangle_generic_items                 = "deny"
+non_camel_case_types                    = "deny"
+non_fmt_panics                          = "deny"
+non_shorthand_field_patterns            = "deny"
+non_snake_case                          = "deny"
+non_upper_case_globals                  = "deny"
+noop_method_call                        = "deny"
+opaque_hidden_inferred_bound            = "deny"
+overlapping_range_endpoints             = "deny"
+path_statements                         = "deny"
+private_bounds                          = "deny"
+private_interfaces                      = "deny"
+redundant_semicolons                    = "deny"
+refining_impl_trait                     = { level = "deny", priority = -1 }
+renamed_and_removed_lints               = "deny"
+repr_transparent_non_zst_fields         = "deny"
+semicolon_in_expressions_from_macros    = "deny"
+special_module_name                     = "deny"
+stable_features                         = "deny"
+suspicious_double_ref_op                = "deny"
+trivial_bounds                          = "deny"
+type_alias_bounds                       = "deny"
+tyvar_behind_raw_pointer                = "deny"
+uncommon_codepoints                     = "deny"
+unconditional_recursion                 = "deny"
+unexpected_cfgs                         = "deny"
+ungated_async_fn_track_caller           = "deny"
+uninhabited_static                      = "deny"
+unknown_lints                           = "deny"
+unnameable_test_items                   = "deny"
+unreachable_code                        = "deny"
+unreachable_patterns                    = "deny"
+unstable_name_collisions                = "deny"
+unstable_syntax_pre_expansion           = "deny"
+unused_allocation                       = "deny"
+unused_assignments                      = "deny"
+unused_associated_type_bounds           = "deny"
+unused_attributes                       = "deny"
+unused_braces                           = "deny"
+unused_comparisons                      = "deny"
+unused_doc_comments                     = "deny"
+unused_features                         = "deny"
+unused_imports                          = "deny"
+unused_labels                           = "deny"
+unused_macros                           = "deny"
+unused_must_use                         = "deny"
+unused_mut                              = "deny"
+unused_parens                           = "deny"
+unused_unsafe                           = "deny"
+unused_variables                        = "deny"
+useless_ptr_null_checks                 = "deny"
+while_true                              = "deny"
 
 [workspace.lints.clippy]
 module_name_repetitions = { level = "allow", priority = 1 }
diff --git a/crates/server/src/snippets/mod.rs b/crates/server/src/snippets/mod.rs
@@ -39,7 +39,7 @@ async fn load(config: &config::SnippetConfig) -> HashMap<ClipEntry, Option<PathB
                 clipcat_base::utils::fs::read_dir_recursively_async(&path)
                     .await
                     .into_iter()
-                    .map(|file| (async move { (tokio::fs::read(&file).await.ok(), file) })),
+                    .map(|file| async move { (tokio::fs::read(&file).await.ok(), file) }),
             )
             .await
             .into_iter()
diff --git a/devshell/default.nix b/devshell/default.nix
@@ -40,7 +40,7 @@ pkgs.mkShell {
 
       buf
       hclfmt
-      nixfmt-rfc-style
+      nixfmt
       nodePackages.prettier
       shfmt
       taplo
diff --git a/devshell/format.nix b/devshell/format.nix
@@ -8,7 +8,7 @@ pkgs.runCommandNoCC "check-format"
       shellcheck
 
       buf
-      nixfmt-rfc-style
+      nixfmt
       nodePackages.prettier
       shfmt
       taplo
diff --git a/flake.lock b/flake.lock

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ async fn load(config: &config::SnippetConfig) -> HashMap<ClipEntry, Option<PathB`
`39`	`39`	`clipcat_base::utils::fs::read_dir_recursively_async(&path)`
`40`	`40`	`.await`
`41`	`41`	`.into_iter()`
`42`		`- .map(\|file\| (async move { (tokio::fs::read(&file).await.ok(), file) })),`
	`42`	`+ .map(\|file\| async move { (tokio::fs::read(&file).await.ok(), file) }),`
`43`	`43`	`)`
`44`	`44`	`.await`
`45`	`45`	`.into_iter()`