Merge pull request #482 from Enet4/chore/core/cleanup

Code cleanup (beta toolchain checks)
Enet4 · Mar 20, 2024 · 9dc4521 · 9dc4521
2 parents 7c0e5ab + d3a5907
commit 9dc4521
Show file tree

Hide file tree

Showing 28 changed files with 103 additions and 152 deletions.
diff --git a/core/src/dictionary/data_element.rs b/core/src/dictionary/data_element.rs
@@ -152,8 +152,6 @@ enum ParseSelectorErrorInner {
     ParseKey,
     /// invalid item index, should be an unsigned integer
     ParseItemIndex,
-    /// intermediate selector step should select a sequence item
-    ParseItem,
     /// last selector step should select a plain tag
     ParseLeaf,
 }

diff --git a/core/src/header.rs b/core/src/header.rs
@@ -1217,7 +1217,7 @@ impl PartialOrd<Length> for Length {
     }
 }
 
-impl ::std::ops::Add<Length> for Length {
+impl std::ops::Add<Length> for Length {
     type Output = Self;
 
     fn add(self, rhs: Length) -> Self::Output {
@@ -1235,7 +1235,7 @@ impl ::std::ops::Add<Length> for Length {
     }
 }
 
-impl ::std::ops::Add<i32> for Length {
+impl std::ops::Add<i32> for Length {
     type Output = Self;
 
     fn add(self, rhs: i32) -> Self::Output {
@@ -1357,11 +1357,7 @@ impl fmt::Display for Length {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{
-        dicom_value,
-        value::{InMemFragment, PixelFragmentSequence},
-        DicomValue,
-    };
+    use crate::{dicom_value, value::PixelFragmentSequence, DicomValue};
 
     #[test]
     fn to_clean_string() {

diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -145,7 +145,6 @@ macro_rules! dicom_value {
 
 #[cfg(test)]
 mod tests {
-    use crate::dicom_value;
     use crate::value::PrimitiveValue;
     use smallvec::smallvec;
 

diff --git a/core/src/value/deserialize.rs b/core/src/value/deserialize.rs
@@ -460,7 +460,6 @@ pub fn parse_datetime_partial(buf: &[u8]) -> Result<DicomDateTime> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use chrono::{FixedOffset, NaiveDate, NaiveTime};
 
     #[test]
     fn test_parse_date() {

diff --git a/core/src/value/mod.rs b/core/src/value/mod.rs
@@ -1086,7 +1086,6 @@ impl<P> DicomValueType for PixelFragmentSequence<P> {
 mod tests {
     use super::*;
     use crate::dicom_value;
-    use crate::header::EmptyObject;
     use smallvec::smallvec;
 
     #[test]

diff --git a/core/src/value/partial.rs b/core/src/value/partial.rs
@@ -987,10 +987,8 @@ impl PartialOrd for PreciseDateTime {
 
 #[cfg(test)]
 mod tests {
-    use crate::value::range::AsRange;
-
     use super::*;
-    use chrono::{NaiveDateTime, TimeZone};
+    use chrono::TimeZone;
 
     #[test]
     fn test_dicom_date() {

diff --git a/encoding/src/decode/explicit_be.rs b/encoding/src/decode/explicit_be.rs
@@ -1,8 +1,11 @@
 //! Explicit VR Big Endian syntax transfer implementation.
 
 use crate::decode::basic::BigEndianBasicDecoder;
-use crate::decode::*;
-use crate::decode::{BasicDecode, Decode, DecodeFrom};
+use crate::decode::{
+    BadSequenceHeaderSnafu, BasicDecode, Decode, DecodeFrom, ReadHeaderTagSnafu,
+    ReadItemHeaderSnafu, ReadItemLengthSnafu, ReadLengthSnafu, ReadReservedSnafu, ReadTagSnafu,
+    ReadVrSnafu, Result,
+};
 use byteordered::byteorder::{BigEndian, ByteOrder};
 use dicom_core::header::{DataElementHeader, Length, SequenceItemHeader};
 use dicom_core::{Tag, VR};
@@ -65,7 +68,9 @@ impl Decode for ExplicitVRBigEndianDecoder {
             }
             _ => {
                 // read 2 bytes for the data length
-                source.read_exact(&mut buf[0..2]).context(ReadLengthSnafu)?;
+                source
+                    .read_exact(&mut buf[0..2])
+                    .context(ReadItemLengthSnafu)?;
                 bytes_read = 8;
                 u32::from(BigEndian::read_u16(&buf[0..2]))
             }

diff --git a/encoding/src/decode/explicit_le.rs b/encoding/src/decode/explicit_le.rs
@@ -1,7 +1,11 @@
 //! Explicit VR Little Endian syntax transfer implementation
 
 use crate::decode::basic::LittleEndianBasicDecoder;
-use crate::decode::*;
+use crate::decode::{
+    BadSequenceHeaderSnafu, BasicDecode, Decode, DecodeFrom, ReadHeaderTagSnafu,
+    ReadItemHeaderSnafu, ReadItemLengthSnafu, ReadLengthSnafu, ReadReservedSnafu, ReadTagSnafu,
+    ReadVrSnafu, Result,
+};
 use byteordered::byteorder::{ByteOrder, LittleEndian};
 use dicom_core::header::{DataElementHeader, Length, SequenceItemHeader};
 use dicom_core::{Tag, VR};

diff --git a/encoding/src/decode/implicit_le.rs b/encoding/src/decode/implicit_le.rs
@@ -1,7 +1,11 @@
 //! Implicit VR Big Endian syntax transfer implementation
 
 use crate::decode::basic::LittleEndianBasicDecoder;
-use crate::decode::*;
+use crate::decode::{
+    BadSequenceHeaderSnafu, BasicDecode, DecodeFrom, ReadHeaderTagSnafu, ReadLengthSnafu,
+    ReadTagSnafu, Result,
+};
+use crate::Decode;
 use byteordered::byteorder::{ByteOrder, LittleEndian};
 use dicom_core::dictionary::{DataDictionary, DataDictionaryEntry};
 use dicom_core::header::{DataElementHeader, Length, SequenceItemHeader};