[web] Fix clippy issues

Enet4 · Jan 16, 2025 · 1ec9c6c · 1ec9c6c
1 parent f091018
commit 1ec9c6c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/web/src/qido.rs b/web/src/qido.rs
@@ -31,7 +31,7 @@ impl QidoRequest {
         }
     }
 
-    pub async fn run(self: &Self) -> Result<Vec<InMemDicomObject>, DicomWebError> {
+    pub async fn run(&self) -> Result<Vec<InMemDicomObject>, DicomWebError> {
         let mut query: Vec<(String, String)> = vec![];
         if let Some(limit) = self.limit {
             query.push((String::from("limit"), limit.to_string()));
@@ -99,27 +99,27 @@ impl QidoRequest {
             .collect())
     }
 
-    pub fn with_limit(self: &mut Self, limit: u32) -> &mut Self {
+    pub fn with_limit(&mut self, limit: u32) -> &mut Self {
         self.limit = Some(limit);
         self
     }
 
-    pub fn with_offset(self: &mut Self, offset: u32) -> &mut Self {
+    pub fn with_offset(&mut self, offset: u32) -> &mut Self {
         self.offset = Some(offset);
         self
     }
 
-    pub fn with_includefields(self: &mut Self, includefields: Vec<Tag>) -> &mut Self {
+    pub fn with_includefields(&mut self, includefields: Vec<Tag>) -> &mut Self {
         self.includefields = includefields;
         self
     }
 
-    pub fn with_fuzzymatching(self: &mut Self, fuzzymatching: bool) -> &mut Self {
+    pub fn with_fuzzymatching(&mut self, fuzzymatching: bool) -> &mut Self {
         self.fuzzymatching = Some(fuzzymatching);
         self
     }
 
-    pub fn with_filter(self: &mut Self, tag: Tag, value: String) -> &mut Self {
+    pub fn with_filter(&mut self, tag: Tag, value: String) -> &mut Self {
         self.filters.push((tag, value));
         self
     }

diff --git a/web/src/wado.rs b/web/src/wado.rs
@@ -22,7 +22,7 @@ impl WadoMetadataRequest {
         WadoMetadataRequest { client, url }
     }
 
-    pub async fn run(self: &Self) -> Result<Vec<InMemDicomObject>, DicomWebError> {
+    pub async fn run(&self) -> Result<Vec<InMemDicomObject>, DicomWebError> {
         let request = self.client.client.get(&self.url);
 
         // Basic authentication
@@ -85,7 +85,7 @@ impl WadoFileRequest {
         WadoFileRequest { client, url }
     }
 
-    pub async fn run(self: &Self) -> Result<Vec<FileDicomObject<InMemDicomObject>>, DicomWebError> {
+    pub async fn run(&self) -> Result<Vec<FileDicomObject<InMemDicomObject>>, DicomWebError> {
         let request = self.client.client.get(&self.url);
 
         // Basic authentication
@@ -163,12 +163,11 @@ pub struct WadoSingleFileRequest {
 }
 
 impl WadoSingleFileRequest {
-    pub async fn run(self: &Self) -> Result<FileDicomObject<InMemDicomObject>, DicomWebError> {
-        return self
-            .request
+    pub async fn run(&self) -> Result<FileDicomObject<InMemDicomObject>, DicomWebError> {
+        self.request
             .run()
             .await
-            .map(|mut v| v.pop().context(EmptyResponseSnafu))?;
+            .map(|mut v| v.pop().context(EmptyResponseSnafu))?
     }
 }
 
@@ -182,7 +181,7 @@ impl WadoFramesRequest {
         WadoFramesRequest { client, url }
     }
 
-    pub async fn run(self: &Self) -> Result<Vec<MultipartItem>, DicomWebError> {
+    pub async fn run(&self) -> Result<Vec<MultipartItem>, DicomWebError> {
         let request = self.client.client.get(&self.url);
 
         // Basic authentication