Fix remaining clippy issues with --all-targets

crates/amalthea/tests/client/dummy_frontend.rs

@@ -27,15 +27,15 @@ use crossbeam::channel::Sender;
 use super::control;
 use super::shell;
 
-static AMALTHEA_FRONTEND: OnceLock<
-    Arc<Mutex<(DummyFrontend, Sender<CommEvent>, Sender<IOPubMessage>)>>,
-> = OnceLock::new();
+type FrontendState = (DummyFrontend, Sender<CommEvent>, Sender<IOPubMessage>);
+
+static AMALTHEA_FRONTEND: OnceLock<Arc<Mutex<FrontendState>>> = OnceLock::new();
 
 /// Wrapper around `DummyFrontend` that checks sockets are empty on drop
 pub struct DummyAmaltheaFrontend {
     pub comm_event_tx: Sender<CommEvent>,
     pub iopub_tx: Sender<IOPubMessage>,
-    guard: MutexGuard<'static, (DummyFrontend, Sender<CommEvent>, Sender<IOPubMessage>)>,
+    guard: MutexGuard<'static, FrontendState>,
 }
 
 impl DummyAmaltheaFrontend {
@@ -50,12 +50,11 @@ impl DummyAmaltheaFrontend {
         }
     }
 
-    fn get_frontend(
-    ) -> &'static Arc<Mutex<(DummyFrontend, Sender<CommEvent>, Sender<IOPubMessage>)>> {
+    fn get_frontend() -> &'static Arc<Mutex<FrontendState>> {
         AMALTHEA_FRONTEND.get_or_init(|| Arc::new(Mutex::new(DummyAmaltheaFrontend::init())))
     }
 
-    fn init() -> (DummyFrontend, Sender<CommEvent>, Sender<IOPubMessage>) {
+    fn init() -> FrontendState {
         let connection = DummyConnection::new();
         let (connection_file, registration_file) = connection.get_connection_files();
 

crates/ark/src/dap/dap_state.rs

@@ -790,7 +790,7 @@ mod tests {
 
         dap.did_change_document(&uri);
 
-        assert!(dap.breakpoints.get(&uri).is_none());
+        assert!(!dap.breakpoints.contains_key(&uri));
 
         let event1 = rx.try_recv().unwrap();
         let event2 = rx.try_recv().unwrap();
@@ -848,8 +848,8 @@ mod tests {
 
         dap.did_change_document(&uri1);
 
-        assert!(dap.breakpoints.get(&uri1).is_none());
-        assert!(dap.breakpoints.get(&uri2).is_some());
+        assert!(!dap.breakpoints.contains_key(&uri1));
+        assert!(dap.breakpoints.contains_key(&uri2));
 
         let event = rx.try_recv().unwrap();
         assert!(matches!(event, DapBackendEvent::BreakpointState {
@@ -897,6 +897,6 @@ mod tests {
         dap.did_change_document(&uri);
 
         // Breakpoints should still be removed
-        assert!(dap.breakpoints.get(&uri).is_none());
+        assert!(!dap.breakpoints.contains_key(&uri));
     }
 }

crates/ark/src/lsp/inputs/package.rs

@@ -181,11 +181,14 @@ mod tests {
 
     #[test]
     fn exported_symbols_are_sorted_and_unique() {
-        let mut ns = Namespace::default();
-        ns.exports = vec!["b".to_string(), "a".to_string(), "a".to_string()];
+        let ns = Namespace {
+            exports: vec!["b".to_string(), "a".to_string(), "a".to_string()],
+            ..Default::default()
+        };
 
-        let mut index = Index::default();
-        index.names = vec!["c".to_string(), "a".to_string(), "a".to_string()];
+        let index = Index {
+            names: vec!["c".to_string(), "a".to_string(), "a".to_string()],
+        };
 
         let pkg = new_package("foo", ns, index);
         assert_eq!(pkg.exported_symbols, vec!["a", "b", "c"]);

crates/ark/src/lsp/symbols.rs

@@ -1135,12 +1135,16 @@ outer <- 4
 
             let code = "# Section ----\nfoo <- 1";
 
-            let mut config = LspConfig::default();
-            config.workspace_symbols = WorkspaceSymbolsConfig {
-                include_comment_sections,
+            let config = LspConfig {
+                workspace_symbols: WorkspaceSymbolsConfig {
+                    include_comment_sections,
+                },
+                ..Default::default()
+            };
+            let state = WorldState {
+                config,
+                ..Default::default()
             };
-            let mut state = WorldState::default();
-            state.config = config;
 
             // Index the document
             let doc = Document::new(code, None);

crates/stdext/src/lib.rs

@@ -51,7 +51,10 @@ macro_rules! assert_match {
     };
 
     ($expression:expr, $pattern:pat_param) => {
-        assert!(matches!($expression, $pattern))
+        #[allow(clippy::redundant_pattern_matching)]
+        {
+            assert!(matches!($expression, $pattern))
+        }
     };
 }