fix: fix lints and errors

xrelkd · xrelkd · commit d0d996d15990 · 2024-05-19T14:24:13.000+08:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -80,7 +80,6 @@ coherence_leak_check                     = "deny"
 confusable_idents                        = "deny"
 const_evaluatable_unchecked              = "deny"
 const_item_mutation                      = "deny"
-const_patterns_without_partial_eq        = "deny"
 dead_code                                = "deny"
 deprecated                               = "deny"
 deprecated_where_clause_location         = "deny"
@@ -100,7 +99,6 @@ forgetting_references                    = "deny"
 for_loops_over_fallibles                 = "deny"
 function_item_references                 = "deny"
 hidden_glob_reexports                    = "deny"
-illegal_floating_point_literal_pattern   = "deny"
 improper_ctypes                          = "deny"
 improper_ctypes_definitions              = "deny"
 incomplete_features                      = "deny"
@@ -119,7 +117,6 @@ legacy_derive_helpers                    = "deny"
 map_unit_fn                              = "deny"
 mixed_script_confusables                 = "deny"
 named_arguments_used_positionally        = "deny"
-nontrivial_structural_match              = "deny"
 non_camel_case_types                     = "deny"
 non_fmt_panics                           = "deny"
 non_shorthand_field_patterns             = "deny"
@@ -134,12 +131,10 @@ private_bounds                           = "deny"
 private_interfaces                       = "deny"
 redundant_semicolons                     = "deny"
 refining_impl_trait                      = "deny"
-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_auto_trait_impls              = "deny"
 suspicious_double_ref_op                 = "deny"
 temporary_cstring_as_ptr                 = "deny"
 trivial_bounds                           = "deny"
diff --git a/clipcat-menu/src/finder/external/choose.rs b/clipcat-menu/src/finder/external/choose.rs
@@ -56,10 +56,6 @@ impl FinderStream for Choose {
             .collect()
     }
 
-    fn line_length(&self) -> Option<usize> { Some(self.line_length) }
-
-    fn menu_length(&self) -> Option<usize> { Some(self.menu_length) }
-
     fn set_line_length(&mut self, line_length: usize) { self.line_length = line_length }
 
     fn set_menu_length(&mut self, menu_length: usize) { self.menu_length = menu_length; }
diff --git a/clipcat-menu/src/finder/external/dmenu.rs b/clipcat-menu/src/finder/external/dmenu.rs
@@ -30,10 +30,6 @@ impl ExternalProgram for Dmenu {
 }
 
 impl FinderStream for Dmenu {
-    fn line_length(&self) -> Option<usize> { Some(self.line_length) }
-
-    fn menu_length(&self) -> Option<usize> { Some(self.menu_length) }
-
     fn set_line_length(&mut self, line_length: usize) { self.line_length = line_length }
 
     fn set_menu_length(&mut self, menu_length: usize) { self.menu_length = menu_length; }
diff --git a/clipcat-menu/src/finder/external/rofi.rs b/clipcat-menu/src/finder/external/rofi.rs
@@ -61,10 +61,6 @@ impl FinderStream for Rofi {
             .collect()
     }
 
-    fn line_length(&self) -> Option<usize> { Some(self.line_length) }
-
-    fn menu_length(&self) -> Option<usize> { Some(self.menu_length) }
-
     fn set_line_length(&mut self, line_length: usize) { self.line_length = line_length }
 
     fn set_menu_length(&mut self, menu_length: usize) { self.menu_length = menu_length; }
diff --git a/clipcat-menu/src/finder/finder_stream.rs b/clipcat-menu/src/finder/finder_stream.rs
@@ -32,10 +32,6 @@ pub trait FinderStream: Send + Sync {
     fn set_line_length(&mut self, _line_length: usize) {}
 
     fn set_menu_length(&mut self, _menu_length: usize) {}
-
-    fn menu_length(&self) -> Option<usize> { None }
-
-    fn line_length(&self) -> Option<usize> { None }
 }
 
 #[cfg(test)]
diff --git a/clipcatd/src/command.rs b/clipcatd/src/command.rs
@@ -113,7 +113,7 @@ impl Cli {
         config.daemonize = !self.no_daemon;
 
         if let Some(history_file_path) = &self.history_file_path {
-            config.history_file_path = history_file_path.clone();
+            config.history_file_path.clone_from(history_file_path);
         }
 
         if let Some(host) = self.grpc_host {
@@ -127,7 +127,7 @@ impl Cli {
 
         if let Some(path) = &self.grpc_socket_path {
             config.grpc.enable_local_socket = true;
-            config.grpc.local_socket = path.clone();
+            config.grpc.local_socket.clone_from(path);
         }
 
         if !config.grpc.enable_http && !config.grpc.enable_local_socket {
diff --git a/crates/base/src/kind.rs b/crates/base/src/kind.rs
@@ -84,7 +84,7 @@ impl From<usize> for Kind {
 }
 
 impl fmt::Display for Kind {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> fmt::Result { f.write_str(self.as_str()) }
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.write_str(self.as_str()) }
 }
 
 #[derive(Debug, Snafu)]
diff --git a/crates/base/src/lib.rs b/crates/base/src/lib.rs
@@ -82,8 +82,8 @@ pub fn fallback_project_config_directories() -> Vec<PathBuf> {
         return Vec::new();
     };
     vec![
-        [user_dirs.home_dir(), &Path::new(".config"), &Path::new(PROJECT_NAME)].iter().collect(),
-        [user_dirs.home_dir(), &Path::new(&format!(".{PROJECT_NAME}"))].iter().collect(),
+        [user_dirs.home_dir(), Path::new(".config"), Path::new(PROJECT_NAME)].iter().collect(),
+        [user_dirs.home_dir(), Path::new(&format!(".{PROJECT_NAME}"))].iter().collect(),
     ]
 }
 
diff --git a/crates/clipboard/src/listener/x11/context.rs b/crates/clipboard/src/listener/x11/context.rs
@@ -82,7 +82,7 @@ impl Context {
             .context(error::ReplySnafu)?;
 
         if !xfixes.present {
-            return Err(error::Error::XfixesNotPresent);
+            return Err(Error::XfixesNotPresent);
         }
 
         drop(self.connection.set_selection_owner(
@@ -133,7 +133,7 @@ impl Context {
         while Instant::now() < timeout_end {
             let maybe_event = self.connection.poll_for_event().context(error::PollForEventSnafu)?;
             let Some(event) = maybe_event else {
-                thread::sleep(std::time::Duration::from_millis(1));
+                thread::sleep(Duration::from_millis(1));
                 continue;
             };
 
diff --git a/crates/clipboard/src/listener/x11/mod.rs b/crates/clipboard/src/listener/x11/mod.rs
@@ -200,7 +200,7 @@ fn try_reconnect(
                 n = interval.as_millis(),
                 kind = context.clipboard_kind()
             );
-            std::thread::sleep(interval);
+            thread::sleep(interval);
         } else {
             poll.registry()
                 .register(
diff --git a/crates/server/src/history/driver/fs/mod.rs b/crates/server/src/history/driver/fs/mod.rs
@@ -307,14 +307,14 @@ fn header_file_path<P>(file_path: P) -> PathBuf
 where
     P: AsRef<Path>,
 {
-    [file_path.as_ref(), &Path::new("header.json")].into_iter().collect()
+    [file_path.as_ref(), Path::new("header.json")].into_iter().collect()
 }
 
 fn clips_file_path<P>(file_path: P) -> PathBuf
 where
     P: AsRef<Path>,
 {
-    [file_path.as_ref(), &Path::new("clips")].into_iter().collect()
+    [file_path.as_ref(), Path::new("clips")].into_iter().collect()
 }
 
 fn image_dir_path<P>(file_path: P) -> PathBuf
diff --git a/crates/server/src/lib.rs b/crates/server/src/lib.rs
@@ -533,9 +533,7 @@ async fn serve_worker(
                     if synchronize_selection_with_clipboard
                         && clip.kind() == ClipboardKind::Clipboard
                     {
-                        if let Err(err) =
-                            clipboard_manager.mark(id, clipcat_base::ClipboardKind::Primary).await
-                        {
+                        if let Err(err) = clipboard_manager.mark(id, ClipboardKind::Primary).await {
                             tracing::warn!("{err}");
                         }
                     }
diff --git a/crates/server/src/metrics/mod.rs b/crates/server/src/metrics/mod.rs
@@ -15,15 +15,15 @@ impl Metrics {
 
         // gRPC
         registry
-            .register(Box::new(self::grpc::REQUESTS_TOTAL.clone()))
+            .register(Box::new(grpc::REQUESTS_TOTAL.clone()))
             .context(error::SetupMetricsSnafu)?;
 
         // D-Bus
         registry
-            .register(Box::new(self::dbus::REQUESTS_TOTAL.clone()))
+            .register(Box::new(dbus::REQUESTS_TOTAL.clone()))
             .context(error::SetupMetricsSnafu)?;
         registry
-            .register(Box::new(self::dbus::REQUEST_DURATION_SECONDS.clone()))
+            .register(Box::new(dbus::REQUEST_DURATION_SECONDS.clone()))
             .context(error::SetupMetricsSnafu)?;
 
         Ok(Self { registry })
diff --git a/crates/server/src/snippets/event_handler.rs b/crates/server/src/snippets/event_handler.rs
@@ -98,11 +98,6 @@ where
         return None;
     }
 
-    clipcat_base::ClipEntry::new(
-        &data,
-        &mime::TEXT_PLAIN_UTF_8,
-        clipcat_base::ClipboardKind::Clipboard,
-        None,
-    )
-    .ok()
+    ClipEntry::new(&data, &mime::TEXT_PLAIN_UTF_8, clipcat_base::ClipboardKind::Clipboard, None)
+        .ok()
 }
diff --git a/crates/server/src/snippets/mod.rs b/crates/server/src/snippets/mod.rs
@@ -65,7 +65,7 @@ async fn load(config: &config::SnippetConfig) -> HashMap<ClipEntry, Option<PathB
                 return None;
             }
 
-            clipcat_base::ClipEntry::new(
+            ClipEntry::new(
                 &data,
                 &mime::TEXT_PLAIN_UTF_8,
                 clipcat_base::ClipboardKind::Clipboard,

Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,6 @@ impl FinderStream for Choose {`
`56`	`56`	`.collect()`
`57`	`57`	`}`
`58`	`58`
`59`		`- fn line_length(&self) -> Option<usize> { Some(self.line_length) }`
`60`		`-`
`61`		`- fn menu_length(&self) -> Option<usize> { Some(self.menu_length) }`
`62`		`-`
`63`	`59`	`fn set_line_length(&mut self, line_length: usize) { self.line_length = line_length }`
`64`	`60`
`65`	`61`	`fn set_menu_length(&mut self, menu_length: usize) { self.menu_length = menu_length; }`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,6 @@ impl ExternalProgram for Dmenu {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`impl FinderStream for Dmenu {`
`33`		`- fn line_length(&self) -> Option<usize> { Some(self.line_length) }`
`34`		`-`
`35`		`- fn menu_length(&self) -> Option<usize> { Some(self.menu_length) }`
`36`		`-`
`37`	`33`	`fn set_line_length(&mut self, line_length: usize) { self.line_length = line_length }`
`38`	`34`
`39`	`35`	`fn set_menu_length(&mut self, menu_length: usize) { self.menu_length = menu_length; }`
Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,6 @@ impl FinderStream for Rofi {`
`61`	`61`	`.collect()`
`62`	`62`	`}`
`63`	`63`
`64`		`- fn line_length(&self) -> Option<usize> { Some(self.line_length) }`
`65`		`-`
`66`		`- fn menu_length(&self) -> Option<usize> { Some(self.menu_length) }`
`67`		`-`
`68`	`64`	`fn set_line_length(&mut self, line_length: usize) { self.line_length = line_length }`
`69`	`65`
`70`	`66`	`fn set_menu_length(&mut self, menu_length: usize) { self.menu_length = menu_length; }`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,6 @@ pub trait FinderStream: Send + Sync {`
`32`	`32`	`fn set_line_length(&mut self, _line_length: usize) {}`
`33`	`33`
`34`	`34`	`fn set_menu_length(&mut self, _menu_length: usize) {}`
`35`		`-`
`36`		`- fn menu_length(&self) -> Option<usize> { None }`
`37`		`-`
`38`		`- fn line_length(&self) -> Option<usize> { None }`
`39`	`35`	`}`
`40`	`36`
`41`	`37`	`#[cfg(test)]`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ impl Cli {`
`113`	`113`	`config.daemonize = !self.no_daemon;`
`114`	`114`
`115`	`115`	`if let Some(history_file_path) = &self.history_file_path {`
`116`		`- config.history_file_path = history_file_path.clone();`
	`116`	`+ config.history_file_path.clone_from(history_file_path);`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`if let Some(host) = self.grpc_host {`
`@@ -127,7 +127,7 @@ impl Cli {`
`127`	`127`
`128`	`128`	`if let Some(path) = &self.grpc_socket_path {`
`129`	`129`	`config.grpc.enable_local_socket = true;`
`130`		`- config.grpc.local_socket = path.clone();`
	`130`	`+ config.grpc.local_socket.clone_from(path);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`if !config.grpc.enable_http && !config.grpc.enable_local_socket {`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ impl From<usize> for Kind {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`impl fmt::Display for Kind {`
`87`		`- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> fmt::Result { f.write_str(self.as_str()) }`
	`87`	`+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.write_str(self.as_str()) }`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`#[derive(Debug, Snafu)]`
Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,8 @@ pub fn fallback_project_config_directories() -> Vec<PathBuf> {`
`82`	`82`	`return Vec::new();`
`83`	`83`	`};`
`84`	`84`	`vec![`
`85`		`- [user_dirs.home_dir(), &Path::new(".config"), &Path::new(PROJECT_NAME)].iter().collect(),`
`86`		`- [user_dirs.home_dir(), &Path::new(&format!(".{PROJECT_NAME}"))].iter().collect(),`
	`85`	`+ [user_dirs.home_dir(), Path::new(".config"), Path::new(PROJECT_NAME)].iter().collect(),`
	`86`	`+ [user_dirs.home_dir(), Path::new(&format!(".{PROJECT_NAME}"))].iter().collect(),`
`87`	`87`	`]`
`88`	`88`	`}`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -307,14 +307,14 @@ fn header_file_path<P>(file_path: P) -> PathBuf`
`307`	`307`	`where`
`308`	`308`	`P: AsRef<Path>,`
`309`	`309`	`{`
`310`		`- [file_path.as_ref(), &Path::new("header.json")].into_iter().collect()`
	`310`	`+ [file_path.as_ref(), Path::new("header.json")].into_iter().collect()`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`fn clips_file_path<P>(file_path: P) -> PathBuf`
`314`	`314`	`where`
`315`	`315`	`P: AsRef<Path>,`
`316`	`316`	`{`
`317`		`- [file_path.as_ref(), &Path::new("clips")].into_iter().collect()`
	`317`	`+ [file_path.as_ref(), Path::new("clips")].into_iter().collect()`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`fn image_dir_path<P>(file_path: P) -> PathBuf`
Original file line number	Diff line number	Diff line change
`@@ -533,9 +533,7 @@ async fn serve_worker(`
`533`	`533`	`if synchronize_selection_with_clipboard`
`534`	`534`	`&& clip.kind() == ClipboardKind::Clipboard`
`535`	`535`	`{`
`536`		`- if let Err(err) =`
`537`		`- clipboard_manager.mark(id, clipcat_base::ClipboardKind::Primary).await`
`538`		`- {`
	`536`	`+ if let Err(err) = clipboard_manager.mark(id, ClipboardKind::Primary).await {`
`539`	`537`	`tracing::warn!("{err}");`
`540`	`538`	`}`
`541`	`539`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,11 +98,6 @@ where`
`98`	`98`	`return None;`
`99`	`99`	`}`
`100`	`100`
`101`		`- clipcat_base::ClipEntry::new(`
`102`		`- &data,`
`103`		`- &mime::TEXT_PLAIN_UTF_8,`
`104`		`- clipcat_base::ClipboardKind::Clipboard,`
`105`		`- None,`
`106`		`- )`
`107`		`- .ok()`
	`101`	`+ ClipEntry::new(&data, &mime::TEXT_PLAIN_UTF_8, clipcat_base::ClipboardKind::Clipboard, None)`
	`102`	`+ .ok()`
`108`	`103`	`}`