style updates

davidsemakula · davidsemakula · commit 70b4110a7d3b · 2023-11-02T15:02:37.000+03:00
diff --git a/crates/analyzer/src/analysis/diagnostics/contract.rs b/crates/analyzer/src/analysis/diagnostics/contract.rs
@@ -1117,7 +1117,7 @@ mod tests {
                 let fix = &item.quickfixes.as_ref().unwrap()[0];
                 assert!(fix.label.contains("Remove"));
                 for edit in &fix.edits {
-                    assert_eq!(&edit.text, "");
+                    assert!(edit.text.is_empty());
                 }
             }
         }
diff --git a/crates/analyzer/src/analysis/diagnostics/event.rs b/crates/analyzer/src/analysis/diagnostics/event.rs
@@ -480,7 +480,7 @@ mod tests {
         // Verifies quickfixes.
         let fix = &results[0].quickfixes.as_ref().unwrap()[0];
         assert!(fix.label.contains("Remove `#[cfg(test)]`"));
-        assert_eq!(&fix.edits[0].text, "");
+        assert!(fix.edits[0].text.is_empty());
         assert_eq!(
             fix.edits[0].range,
             TextRange::new(
diff --git a/crates/analyzer/src/analysis/diagnostics/ink_e2e_test.rs b/crates/analyzer/src/analysis/diagnostics/ink_e2e_test.rs
@@ -101,7 +101,7 @@ mod tests {
             // Verifies quickfixes.
             let fix = &result.as_ref().unwrap().quickfixes.as_ref().unwrap()[0];
             assert!(fix.label.contains("Remove `#[ink_e2e::test]`"));
-            assert_eq!(&fix.edits[0].text, "");
+            assert!(fix.edits[0].text.is_empty());
             assert_eq!(
                 fix.edits[0].range,
                 TextRange::new(
diff --git a/crates/analyzer/src/analysis/diagnostics/ink_impl.rs b/crates/analyzer/src/analysis/diagnostics/ink_impl.rs
@@ -1139,7 +1139,7 @@ mod tests {
             // Verifies quickfixes.
             let fix = &result.as_ref().unwrap().quickfixes.as_ref().unwrap()[0];
             assert!(fix.label.contains("Remove `#[ink(impl)]`"));
-            assert_eq!(&fix.edits[0].text, "");
+            assert!(fix.edits[0].text.is_empty());
             assert_eq!(
                 fix.edits[0].range,
                 TextRange::new(
diff --git a/crates/analyzer/src/analysis/diagnostics/ink_test.rs b/crates/analyzer/src/analysis/diagnostics/ink_test.rs
@@ -101,7 +101,7 @@ mod tests {
             // Verifies quickfixes.
             let fix = &result.as_ref().unwrap().quickfixes.as_ref().unwrap()[0];
             assert!(fix.label.contains("Remove `#[ink::test]`"));
-            assert_eq!(&fix.edits[0].text, "");
+            assert!(fix.edits[0].text.is_empty());
             assert_eq!(
                 fix.edits[0].range,
                 TextRange::new(
diff --git a/crates/analyzer/src/analysis/diagnostics/storage_item.rs b/crates/analyzer/src/analysis/diagnostics/storage_item.rs
@@ -130,7 +130,7 @@ mod tests {
             // Verifies quickfixes.
             let fix = &result.as_ref().unwrap().quickfixes.as_ref().unwrap()[0];
             assert!(fix.label.contains("Remove `#[ink::storage_item]`"));
-            assert_eq!(&fix.edits[0].text, "");
+            assert!(fix.edits[0].text.is_empty());
             assert_eq!(
                 fix.edits[0].range,
                 TextRange::new(
diff --git a/crates/analyzer/src/analysis/diagnostics/topic.rs b/crates/analyzer/src/analysis/diagnostics/topic.rs
@@ -101,7 +101,7 @@ mod tests {
             // Verifies quickfixes.
             let fix = &result.as_ref().unwrap().quickfixes.as_ref().unwrap()[0];
             assert!(fix.label.contains("Remove `#[ink(topic)]`"));
-            assert_eq!(&fix.edits[0].text, "");
+            assert!(fix.edits[0].text.is_empty());
             assert_eq!(
                 fix.edits[0].range,
                 TextRange::new(
diff --git a/crates/lsp-server/src/dispatch.rs b/crates/lsp-server/src/dispatch.rs
@@ -310,7 +310,7 @@ mod tests {
         }
         .unwrap();
         assert_eq!(
-            &publish_diagnostics_notification.method,
+            publish_diagnostics_notification.method,
             lsp_types::notification::PublishDiagnostics::METHOD
         );
 
@@ -343,6 +343,6 @@ mod tests {
             _ => None,
         }
         .unwrap();
-        assert_eq!(&completion_response.id, &completion_request_id);
+        assert_eq!(completion_response.id, completion_request_id);
     }
 }
diff --git a/crates/lsp-server/src/dispatch/actions.rs b/crates/lsp-server/src/dispatch/actions.rs
@@ -92,7 +92,7 @@ mod tests {
         assert!(result.is_ok());
         assert!(result.as_ref().unwrap().is_some());
         let params = &result.as_ref().unwrap().as_ref().unwrap()[0];
-        assert_eq!(&params.uri, &uri);
+        assert_eq!(params.uri, uri);
         // 3 Expected diagnostics for missing storage, constructor and message.
         assert_eq!(params.diagnostics.len(), 3);
     }
diff --git a/crates/lsp-server/src/dispatch/handlers/notification.rs b/crates/lsp-server/src/dispatch/handlers/notification.rs
@@ -88,10 +88,11 @@ mod tests {
         assert!(result.is_ok());
         assert_eq!(
             memory.get(uri.as_ref()),
-            Some(&Document {
+            Some(Document {
                 content: content.clone(),
                 version
             })
+            .as_ref()
         );
 
         // Re-initializes memory, calls handler with parameters for an open NON-rust file and verifies that the file is NOT added to memory.
@@ -144,10 +145,11 @@ mod tests {
         assert!(result.is_ok());
         assert_eq!(
             memory.get(uri.as_ref()),
-            Some(&Document {
+            Some(Document {
                 content: updated_content,
                 version: updated_version
             })
+            .as_ref()
         );
     }
 
diff --git a/crates/lsp-server/src/dispatch/handlers/request.rs b/crates/lsp-server/src/dispatch/handlers/request.rs
@@ -480,7 +480,7 @@ mod tests {
         let signature_help = result.unwrap().unwrap();
         let signature_label = &signature_help.signatures[0].label;
         assert_eq!(
-            &signature_help.signatures[0].label,
+            signature_help.signatures[0].label,
             "env: impl Environment, keep_attr: &str"
         );
         let params: Vec<[u32; 2]> = signature_help.signatures[0]
diff --git a/crates/lsp-server/src/dispatch/routers/request.rs b/crates/lsp-server/src/dispatch/routers/request.rs
@@ -150,7 +150,7 @@ mod tests {
             .finish();
         assert!(result.is_some());
         let response = result.unwrap();
-        assert_eq!(&response.id, &req_id);
+        assert_eq!(response.id, req_id);
         assert!(response.result.is_some());
         assert!(response.error.is_none());
 
@@ -163,9 +163,9 @@ mod tests {
             .finish();
         assert!(result.is_some());
         let response = result.unwrap();
-        assert_eq!(&response.id, &req_id);
-        assert!(&response.result.is_none());
-        assert!(&response.error.is_some());
+        assert_eq!(response.id, req_id);
+        assert!(response.result.is_none());
+        assert!(response.error.is_some());
         let message = response.error.as_ref().unwrap().message.to_lowercase();
         assert!(message.contains("unknown") || message.contains("unsupported"));
 
@@ -181,9 +181,9 @@ mod tests {
             .finish();
         assert!(result.is_some());
         let response = result.unwrap();
-        assert_eq!(&response.id, &req_id_invalid);
-        assert!(&response.result.is_none());
-        assert!(&response.error.is_some());
+        assert_eq!(response.id, req_id_invalid);
+        assert!(response.result.is_none());
+        assert!(response.error.is_some());
         let message = response.error.as_ref().unwrap().message.to_lowercase();
         assert!(message.contains("invalid") && message.contains("parameters"));
     }
diff --git a/crates/lsp-server/src/initialize.rs b/crates/lsp-server/src/initialize.rs
@@ -122,11 +122,11 @@ mod tests {
             _ => None,
         }
         .unwrap();
-        assert_eq!(&init_result_resp.id, &init_req_id);
+        assert_eq!(init_result_resp.id, init_req_id);
         // Verifies that an initialization result is created with the expected server name.
         let init_result: lsp_types::InitializeResult =
             serde_json::from_value(init_result_resp.result.unwrap()).unwrap();
-        assert_eq!(&init_result.server_info.unwrap().name, "ink-analyzer");
+        assert_eq!(init_result.server_info.unwrap().name, "ink-analyzer");
     }
 
     #[test]
diff --git a/crates/lsp-server/src/memory.rs b/crates/lsp-server/src/memory.rs
@@ -91,10 +91,11 @@ mod tests {
         // Retrieves document and verifies contents.
         assert_eq!(
             memory.get("1"),
-            Some(&Document {
+            Some(Document {
                 content: "A".to_string(),
                 version: 0
             })
+            .as_ref()
         );
         // Tries to retrieve non-existent document.
         assert_eq!(memory.get("0"), None);
@@ -103,10 +104,11 @@ mod tests {
         assert!(memory.update("1", "A1".to_string(), 1));
         assert_eq!(
             memory.get("1"),
-            Some(&Document {
+            Some(Document {
                 content: "A1".to_string(),
                 version: 1
             })
+            .as_ref()
         );
         // Verifies changes.
         assert_eq!(
diff --git a/crates/lsp-server/tests/actions.rs b/crates/lsp-server/tests/actions.rs
@@ -96,7 +96,7 @@ fn actions_works() {
                 })
                 .unwrap();
             // Verifies that the code action response is for the current request.
-            assert_eq!(&resp.id, &req_id);
+            assert_eq!(resp.id, req_id);
 
             // Verifies expected code actions results.
             let code_action_response: lsp_types::CodeActionResponse =
diff --git a/crates/lsp-server/tests/completions.rs b/crates/lsp-server/tests/completions.rs
@@ -95,7 +95,7 @@ fn completions_works() {
                 })
                 .unwrap();
             // Verifies that the completion response is for the current request.
-            assert_eq!(&resp.id, &req_id);
+            assert_eq!(resp.id, req_id);
 
             // Verifies expected completion results.
             let expected_results = match test_case.results {
diff --git a/crates/lsp-server/tests/diagnostics.rs b/crates/lsp-server/tests/diagnostics.rs
@@ -60,7 +60,7 @@ fn diagnostics_works() {
             // Verifies that the diagnostics response is for the current source file and modified version.
             let diagnostics_params: lsp_types::PublishDiagnosticsParams =
                 serde_json::from_value(diagnostics_notification.params).unwrap();
-            assert_eq!(&diagnostics_params.uri, &uri);
+            assert_eq!(diagnostics_params.uri, uri);
             assert_eq!(diagnostics_params.version.unwrap(), version);
             // Verifies expected diagnostics results.
             let results = diagnostics_params.diagnostics;
diff --git a/crates/lsp-server/tests/hover.rs b/crates/lsp-server/tests/hover.rs
@@ -97,7 +97,7 @@ fn hover_works() {
                 })
                 .unwrap();
             // Verifies that the hover response are for the current request.
-            assert_eq!(&resp.id, &req_id);
+            assert_eq!(resp.id, req_id);
 
             // Verifies expected hover content results.
             let expected_results = match test_case.results {
diff --git a/crates/lsp-server/tests/inlay_hints.rs b/crates/lsp-server/tests/inlay_hints.rs
@@ -94,7 +94,7 @@ fn inlay_hints_works() {
                 })
                 .unwrap();
             // Verifies that the inlay hints response is for the current request.
-            assert_eq!(&resp.id, &req_id);
+            assert_eq!(resp.id, req_id);
 
             // Verifies expected inlay hints results.
             let results: Vec<lsp_types::InlayHint> =
diff --git a/crates/lsp-server/tests/signature_help.rs b/crates/lsp-server/tests/signature_help.rs
@@ -94,7 +94,7 @@ fn signature_help_works() {
                 })
                 .unwrap();
             // Verifies that the signature help response is for the current request.
-            assert_eq!(&resp.id, &req_id);
+            assert_eq!(resp.id, req_id);
 
             // Verifies expected signature help results.
             let expected_results = match test_case.results {

Original file line number	Diff line number	Diff line change
`@@ -1117,7 +1117,7 @@ mod tests {`
`1117`	`1117`	`let fix = &item.quickfixes.as_ref().unwrap()[0];`
`1118`	`1118`	`assert!(fix.label.contains("Remove"));`
`1119`	`1119`	`for edit in &fix.edits {`
`1120`		`- assert_eq!(&edit.text, "");`
	`1120`	`+ assert!(edit.text.is_empty());`
`1121`	`1121`	`}`
`1122`	`1122`	`}`
`1123`	`1123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ mod tests {`
`310`	`310`	`}`
`311`	`311`	`.unwrap();`
`312`	`312`	`assert_eq!(`
`313`		`- &publish_diagnostics_notification.method,`
	`313`	`+ publish_diagnostics_notification.method,`
`314`	`314`	`lsp_types::notification::PublishDiagnostics::METHOD`
`315`	`315`	`);`
`316`	`316`
`@@ -343,6 +343,6 @@ mod tests {`
`343`	`343`	`_ => None,`
`344`	`344`	`}`
`345`	`345`	`.unwrap();`
`346`		`- assert_eq!(&completion_response.id, &completion_request_id);`
	`346`	`+ assert_eq!(completion_response.id, completion_request_id);`
`347`	`347`	`}`
`348`	`348`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ mod tests {`
`92`	`92`	`assert!(result.is_ok());`
`93`	`93`	`assert!(result.as_ref().unwrap().is_some());`
`94`	`94`	`let params = &result.as_ref().unwrap().as_ref().unwrap()[0];`
`95`		`- assert_eq!(&params.uri, &uri);`
	`95`	`+ assert_eq!(params.uri, uri);`
`96`	`96`	`// 3 Expected diagnostics for missing storage, constructor and message.`
`97`	`97`	`assert_eq!(params.diagnostics.len(), 3);`
`98`	`98`	`}`