Merge pull request #366 from Enet4/bug/core/dicom_value_smallvec

Fix using dicom_value! without smallvec import
Enet4 · Jun 14, 2023 · 07dc7a9 · 07dc7a9
2 parents 4ef834c + d90d290
commit 07dc7a9
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -120,28 +120,16 @@ macro_rules! dicom_value {
     () => { $crate::value::PrimitiveValue::Empty };
     // Multiple strings
     (Strs, [ $($elem: expr),+ , ]) => {
-        {
-            use smallvec::smallvec; // import smallvec macro
-            $crate::value::PrimitiveValue :: Strs (smallvec![$($elem.to_owned(),)*])
-        }
+        $crate::value::PrimitiveValue :: Strs ($crate::smallvec::smallvec![$($elem.to_owned(),)*])
     };
     (Strs, [ $($elem: expr),+ ]) => {
-        {
-            use smallvec::smallvec; // import smallvec macro
-            $crate::value::PrimitiveValue :: Strs (smallvec![$($elem.to_owned(),)*])
-        }
+        $crate::value::PrimitiveValue :: Strs ($crate::smallvec::smallvec![$($elem.to_owned(),)*])
     };
     ($typ: ident, [ $($elem: expr),+ , ]) => {
-        {
-            use smallvec::smallvec; // import smallvec macro
-            $crate::value::PrimitiveValue :: $typ (smallvec![$($elem,)*])
-        }
+        $crate::value::PrimitiveValue :: $typ ($crate::smallvec::smallvec![$($elem,)*])
     };
     ($typ: ident, [ $($elem: expr),+ ]) => {
-        {
-            use smallvec::smallvec; // import smallvec macro
-            $crate::value::PrimitiveValue :: $typ (smallvec![$($elem,)*])
-        }
+        $crate::value::PrimitiveValue :: $typ ($crate::smallvec::smallvec![$($elem,)*])
     };
     (Str, $elem: expr) => {
         $crate::value::PrimitiveValue :: Str (String::from($elem))

diff --git a/core/tests/dicom_value.rs b/core/tests/dicom_value.rs
@@ -0,0 +1,27 @@
+//! Separate test suite for using `dicom_value!` in an isolated context,
+//! without direct access to dependency `smallvec`
+
+// empty module makes `smallvec` dependency unreachable,
+// as would be typical in dependents of `dicom_core`
+// unless they include it themselves
+mod smallvec {}
+
+#[test]
+fn use_dicom_value() {
+    use dicom_core::dicom_value;
+
+    // multiple string literals with variant, no trailing comma
+    let value = dicom_value!(Strs, ["BASE", "LIGHT", "DARK"]);
+    assert_eq!(
+        value.to_multi_str().as_ref(),
+        &["BASE".to_owned(), "LIGHT".to_owned(), "DARK".to_owned(),],
+    );
+
+    // single string with variant
+    let value = dicom_value!(Str, "PALETTE COLOR ");
+    assert_eq!(value.to_string(), "PALETTE COLOR",);
+
+    // numeric values
+    let value = dicom_value!(U16, [1, 2, 5]);
+    assert_eq!(value.to_multi_int::<u16>().unwrap(), &[1, 2, 5],);
+}
diff --git a/echoscu/Cargo.toml b/echoscu/Cargo.toml
@@ -17,7 +17,6 @@ dicom-dictionary-std = { path = "../dictionary-std/", version = "0.5.0" }
 dicom-object = { path = "../object/", version = "0.5.3" }
 dicom-transfer-syntax-registry = { path = "../transfer-syntax-registry/", version = "0.5.1", default-features = false }
 dicom-ul = { path = "../ul", version = "0.4.3" }
-smallvec = "1.6.1"
 snafu = "0.7.3"
 tracing = "0.1.34"
 tracing-subscriber = "0.3.11"
diff --git a/findscu/src/main.rs b/findscu/src/main.rs
@@ -1,5 +1,5 @@
 use clap::Parser;
-use dicom_core::{dicom_value, smallvec};
+use dicom_core::dicom_value;
 use dicom_core::{DataElement, PrimitiveValue, VR};
 use dicom_dictionary_std::tags;
 use dicom_dump::DumpOptions;
@@ -12,7 +12,6 @@ use dicom_ul::{
     pdu::{PDataValue, PDataValueType},
 };
 use query::parse_queries;
-use smallvec::smallvec;
 use snafu::prelude::*;
 use std::io::{stderr, Read};
 use std::path::PathBuf;

diff --git a/storescp/Cargo.toml b/storescp/Cargo.toml
@@ -18,7 +18,6 @@ dicom-object = { path = '../object', version = "0.5.4" }
 dicom-encoding = { path = "../encoding/", version = "0.5.3" }
 dicom-dictionary-std = { path = "../dictionary-std/", version = "0.5.0" }
 dicom-transfer-syntax-registry = { path = "../transfer-syntax-registry/", version = "0.5.1" }
-smallvec = "1.6.1"
 snafu = "0.7.3"
 tracing = "0.1.36"
 tracing-subscriber = "0.3.15"
diff --git a/storescu/src/main.rs b/storescu/src/main.rs
@@ -1,5 +1,5 @@
 use clap::Parser;
-use dicom_core::{dicom_value, header::Tag, smallvec, DataElement, PrimitiveValue, VR};
+use dicom_core::{dicom_value, header::Tag, DataElement, PrimitiveValue, VR};
 use dicom_dictionary_std::tags;
 use dicom_encoding::transfer_syntax;
 use dicom_object::{mem::InMemDicomObject, open_file, StandardDataDictionary};
@@ -9,7 +9,6 @@ use dicom_ul::{
     pdu::{PDataValue, PDataValueType, Pdu},
 };
 use indicatif::{ProgressBar, ProgressStyle};
-use smallvec::smallvec;
 use snafu::prelude::*;
 use snafu::{Report, Whatever};
 use std::collections::HashSet;