Merge branch 'chore/clippy-lint' into chore/cargo-update-2024-12

Enet4 · Dec 7, 2024 · de6d27f · de6d27f
2 parents 6de1bc7 + 16ee87d
commit de6d27f
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/src/value/primitive.rs b/core/src/value/primitive.rs
@@ -464,8 +464,8 @@ impl PrimitiveValue {
             F32(c) => c.len() * 4,
             F64(c) => c.len() * 8,
             Tags(c) => c.len() * 4,
-            Str(s) => s.as_bytes().len(),
-            Strs(c) => c.iter().map(|s| s.as_bytes().len() + 1).sum::<usize>() & !1,
+            Str(s) => s.len(),
+            Strs(c) => c.iter().map(|s| s.len() + 1).sum::<usize>() & !1,
             Date(c) => {
                 c.iter()
                     .map(|d| PrimitiveValue::da_byte_len(d) + 1)

diff --git a/devtools/dictionary-builder/Cargo.toml b/devtools/dictionary-builder/Cargo.toml
@@ -17,7 +17,6 @@ path = "src/main.rs"
 [dependencies]
 clap = { version = "4.0.18", features = ["cargo", "derive"] }
 serde = { version = "1.0.55", features = ["derive"] }
-serde_json = "1.0.17"
 heck = "0.5.0"
 ureq = "2.4.0"
 sxd-document = "0.3.2"

diff --git a/devtools/dictionary-builder/src/tags.rs b/devtools/dictionary-builder/src/tags.rs
@@ -84,6 +84,11 @@ pub fn run(args: DataElementApp) -> Result<()> {
 fn parse_entries<R: BufRead>(source: R) -> Result<Vec<Entry>> {
     let mut result = vec![];
 
+    let regex_tag = Regex::new(r"^\(([0-9A-F]{4}),([0-9A-F]{4})\)$")?;
+    let regex_tag_group100 = Regex::new(r"^\(([0-9A-F]{2})00-[0-9A-F]{2}FF,([0-9A-F]{4})\)$")?;
+    let regex_tag_element100 =
+        Regex::new(r"^\(([0-9A-F]{4}),([0-9A-F]{2})00-[0-9A-F]{2}FF\)$")?;
+
     for line in source.lines() {
         let line = line?;
         if line.starts_with('#') {
@@ -113,11 +118,6 @@ fn parse_entries<R: BufRead>(source: R) -> Result<Vec<Entry>> {
 
         let tag = parts[0].to_string();
 
-        let regex_tag = Regex::new(r"^\(([0-9A-F]{4}),([0-9A-F]{4})\)$")?;
-        let regex_tag_group100 = Regex::new(r"^\(([0-9A-F]{2})00-[0-9A-F]{2}FF,([0-9A-F]{4})\)$")?;
-        let regex_tag_element100 =
-            Regex::new(r"^\(([0-9A-F]{4}),([0-9A-F]{2})00-[0-9A-F]{2}FF\)$")?;
-
         let cap = regex_tag.captures(tag.as_str());
         let tag_type;
         let tag_declaration = if let Some(cap) = cap {

diff --git a/parser/Cargo.toml b/parser/Cargo.toml
@@ -14,7 +14,6 @@ readme = "README.md"
 [dependencies]
 dicom-core = { path = "../core", version = "0.8.0" }
 dicom-encoding = { path = "../encoding", version = "0.8.0" }
-chrono = { version = "0.4.22", default-features = false, features = ["std"] }
 dicom-dictionary-std = { path = "../dictionary-std/", version = "0.8.0" }
 smallvec = "1.6.1"
 snafu = "0.8"

diff --git a/parser/src/dataset/read.rs b/parser/src/dataset/read.rs
@@ -378,7 +378,7 @@ where
                     source: dicom_encoding::decode::Error::ReadItemHeader { source, .. },
                     ..
                 }) if source.kind() == std::io::ErrorKind::UnexpectedEof
-                   && self.seq_delimiters.pop().map_or(false, |t| t.pixel_data)
+                   && self.seq_delimiters.pop().is_some_and(|t| t.pixel_data)
                  => {
                     // Note: if `UnexpectedEof` was reached while inside a 
                     // PixelData Sequence, then we assume that

diff --git a/scpproxy/Cargo.toml b/scpproxy/Cargo.toml
@@ -13,7 +13,6 @@ readme = "README.md"
 [dependencies]
 clap = { version = "4.0.18", features = ["cargo"] }
 dicom-ul = { path = "../ul/", version = "0.8.0" }
-dicom-dictionary-std = { path = "../dictionary-std/", version = "0.8.0" }
 snafu = "0.8"
 tracing = "0.1.34"
 tracing-subscriber = "0.3.11"

diff --git a/ul/Cargo.toml b/ul/Cargo.toml
@@ -31,7 +31,6 @@ features = [
 ]
 
 [dev-dependencies]
-dicom-core = { path = "../core" }
 dicom-dictionary-std = { path = "../dictionary-std" }
 matches = "0.1.8"
 rstest = "0.23.0"

diff --git a/ul/src/association/client.rs b/ul/src/association/client.rs
@@ -1170,7 +1170,7 @@ pub mod non_blocking {
         }
     }
 
-    impl<'a> ClientAssociationOptions<'a> {
+    impl ClientAssociationOptions<'_> {
         async fn establish_impl_async<T>(
             self,
             ae_address: AeAddr<T>,

diff --git a/ul/src/association/pdata.rs b/ul/src/association/pdata.rs
@@ -267,7 +267,7 @@ impl<'a, R> PDataReader<'a, R> {
     }
 }
 
-impl<'a, R> Read for PDataReader<'a, R>
+impl<R> Read for PDataReader<'_, R>
 where
     R: Read,
 {
@@ -594,7 +594,7 @@ pub mod non_blocking {
         }
     }
 
-    impl<'a, R> AsyncRead for PDataReader<'a, R>
+    impl<R> AsyncRead for PDataReader<'_, R>
     where
         R: AsyncRead + Unpin,
     {

diff --git a/ul/src/association/server.rs b/ul/src/association/server.rs
@@ -906,7 +906,7 @@ pub mod non_blocking {
         read_pdu, write_pdu, Pdu, IMPLEMENTATION_CLASS_UID, IMPLEMENTATION_VERSION_NAME,
     };
 
-    impl<'a, A> ServerAssociationOptions<'a, A>
+    impl<A> ServerAssociationOptions<'_, A>
     where
         A: AccessControl,
     {