Merge pull request #587 from qarmin/set_minimial_rust_version

Set minimal rust version to 1.72.0

Author: Enet4

.github/workflows/rust.yml

@@ -14,6 +14,7 @@ jobs:
     strategy:
       matrix:
         rust:
+          - 1.72.0
           - stable
           - beta
     steps:
@@ -24,16 +25,39 @@ jobs:
           components: clippy
           cache: true
       # test project with default + extra features
-      - run: cargo test --features image,ndarray,sop-class,rle,cli,jpegxl
+      - if: matrix.rust == 'stable' || matrix.rust == 'beta'
+        run: cargo test --features image,ndarray,sop-class,rle,cli,jpegxl
       # test dicom-pixeldata with openjp2
-      - run: cargo test -p dicom-pixeldata --features openjp2
+      - if: matrix.rust == 'stable' || matrix.rust == 'beta'
+        run: cargo test -p dicom-pixeldata --features openjp2
       # test dicom-pixeldata with openjpeg-sys and charls
-      - run: cargo test -p dicom-pixeldata --features openjpeg-sys,charls
+      - if: matrix.rust == 'stable' || matrix.rust == 'beta'
+        run: cargo test -p dicom-pixeldata --features openjpeg-sys,charls
       # test dicom-pixeldata with gdcm-rs
-      - run: cargo test -p dicom-pixeldata --features gdcm
+      - if: matrix.rust == 'stable' || matrix.rust == 'beta'
+        run: cargo test -p dicom-pixeldata --features gdcm
       # test dicom-pixeldata without default features
-      - run: cargo test -p dicom-pixeldata --no-default-features
-      - run: cargo test -p dicom-ul --features async
+      - if: matrix.rust == 'stable' || matrix.rust == 'beta'
+        run: cargo test -p dicom-pixeldata --no-default-features
+      # test dicom-ul with async feature
+      - if: matrix.rust == 'stable' || matrix.rust == 'beta'
+        run: cargo test -p dicom-ul --features async
+      # test library projects with minimum rust version
+      - if: matrix.rust == '1.72.0'
+        run: |
+          cargo test -p dicom-core
+          cargo test -p dicom-encoding
+          cargo test -p dicom-dictionary-std
+          cargo test -p dicom-parser
+          cargo test -p dicom-transfer-syntax-registry
+          cargo test -p dicom-object
+          cargo test -p dicom-dump --no-default-features --features sop-class
+          cargo test -p dicom-json
+          cargo test -p dicom-ul
+          cargo test -p dicom-pixeldata
+          cargo check -p dicom
+        env:
+          RUSTFLAGS: -W warnings
       # run Clippy with stable toolchain
       - if: matrix.rust == 'stable'
         run: cargo clippy

README.md

@@ -101,6 +101,9 @@ no other development dependencies are necessary
 unless certain extensions are included via Cargo features.
 Consult each crate for guidelines on selecting features to suit your needs.
 
+Minimum supported Rust version is 1.72.0 and only applies to the library crates with default features.  
+Binary crates and extra features may require a newer version of Rust.
+
 ## Roadmap & Contributing
 
 This project is under active development.

clippy.toml

@@ -0,0 +1 @@
+msrv="1.72.0"

core/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.7.1"
 authors = ["Eduardo Pinho <enet4mikeenet@gmail.com>"]
 description = "Efficient and practical core library for DICOM compliant systems"
 edition = "2018"
+rust-version = "1.72.0"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/Enet4/dicom-rs"
 keywords = ["dicom"]

dictionary-std/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.7.0"
 authors = ["Eduardo Pinho <enet4mikeenet@gmail.com>"]
 description = "Standard DICOM attribute dictionary"
 edition = "2018"
+rust-version = "1.72.0"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/Enet4/dicom-rs"
 keywords = ["dicom", "dictionary"]

dump/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.7.1"
 authors = ["Eduardo Pinho <enet4mikeenet@gmail.com>"]
 description = "A CLI tool for inspecting DICOM files"
 edition = "2018"
+rust-version = "1.72.0"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/Enet4/dicom-rs"
 categories = ["command-line-utilities"]

encoding/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.7.1"
 authors = ["Eduardo Pinho <enet4mikeenet@gmail.com>"]
 description = "DICOM encoding and decoding primitives"
 edition = "2018"
+rust-version = "1.72.0"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/Enet4/dicom-rs"
 categories = ["encoding"]

fromimage/Cargo.toml

@@ -2,6 +2,7 @@
 name = "dicom-fromimage"
 version = "0.7.0"
 edition = "2018"
+rust-version = "1.72.0"
 authors = ["Eduardo Pinho <enet4mikeenet@gmail.com>"]
 description = "A CLI tool for replacing the image content from DICOM files"
 license = "MIT OR Apache-2.0"

object/Cargo.toml

@@ -3,6 +3,7 @@ name = "dicom-object"
 version = "0.7.1"
 authors = ["Eduardo Pinho <enet4mikeenet@gmail.com>"]
 edition = "2018"
+rust-version = "1.72.0"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/Enet4/dicom-rs"
 description = "A high-level API for reading and manipulating DICOM objects"

object/src/lib.rs

@@ -772,7 +772,7 @@ mod tests {
 
     #[test]
     fn errors_not_too_large() {
-        assert_type_not_too_large::<AccessError>(56);
+        assert_type_not_too_large::<AccessError>(64);
     }
 
     #[test]

object/src/mem.rs

@@ -940,19 +940,21 @@ where
     /// reporting whether it was present.
     pub fn remove_element_by_name(&mut self, name: &str) -> Result<bool, AccessByNameError> {
         let tag = self.lookup_name(name)?;
-        Ok(self.entries.remove(&tag).is_some()).inspect(|&removed| {
+        Ok(self.entries.remove(&tag).is_some()).map(|removed| {
             if removed {
                 self.len = Length::UNDEFINED;
             }
+            removed
         })
     }
 
     /// Remove and return a particular DICOM element by its tag.
     pub fn take_element(&mut self, tag: Tag) -> Result<InMemElement<D>> {
         self.entries
             .remove(&tag)
-            .inspect(|_| {
+            .map(|e| {
                 self.len = Length::UNDEFINED;
+                e
             })
             .context(NoSuchDataElementTagSnafu { tag })
     }
@@ -961,8 +963,9 @@ where
     /// if it is present,
     /// returns `None` otherwise.
     pub fn take(&mut self, tag: Tag) -> Option<InMemElement<D>> {
-        self.entries.remove(&tag).inspect(|_| {
+        self.entries.remove(&tag).map(|e| {
             self.len = Length::UNDEFINED;
+            e
         })
     }
 
@@ -974,8 +977,9 @@ where
         let tag = self.lookup_name(name)?;
         self.entries
             .remove(&tag)
-            .inspect(|_| {
+            .map(|e| {
                 self.len = Length::UNDEFINED;
+                e
             })
             .with_context(|| NoSuchDataElementAliasSnafu {
                 tag,

parent/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.7.1"
 authors = ["Eduardo Pinho <enet4mikeenet@gmail.com>"]
 description = "A pure Rust implementation of the DICOM standard"
 edition = "2018"
+rust-version = "1.72.0"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/Enet4/dicom-rs"
 readme = "README.md"

parser/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.7.1"
 authors = ["Eduardo Pinho <enet4mikeenet@gmail.com>"]
 description = "A middle-level parser and printer of DICOM data sets"
 edition = "2018"
+rust-version = "1.72.0"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/Enet4/dicom-rs"
 categories = ["parser-implementations"]

parser/src/stateful/decode.rs

@@ -913,8 +913,9 @@ where
             .context(DecodeItemHeaderSnafu {
                 position: self.position,
             })
-            .inspect(|_| {
+            .map(|header| {
                 self.position += 8;
+                header
             })
             .map_err(From::from)
     }

pixeldata/Cargo.toml

@@ -3,6 +3,7 @@ name = "dicom-pixeldata"
 version = "0.7.1"
 authors = ["Eduardo Pinho <enet4mikeenet@gmail.com>", "Peter Evers <pevers90@gmail.com>"]
 edition = "2018"
+rust-version = "1.72.0"
 license = "MIT OR Apache-2.0"
 description = "A high-level API for decoding DICOM objects into images and ndarrays"
 repository = "https://github.com/Enet4/dicom-rs"

pixeldata/src/attribute.rs

@@ -626,11 +626,12 @@ mod tests {
 
     #[test]
     fn errors_are_not_too_large() {
+        let max_size = 88;
         let size = std::mem::size_of::<super::GetAttributeError>();
         assert!(
-            size <= 80,
-            "GetAttributeError size is too large ({} > 80)",
-            size
+            size <= max_size,
+            "GetAttributeError size is too large ({} > {})",
+            size, max_size
         );
     }
 

toimage/Cargo.toml

@@ -2,6 +2,7 @@
 name = "dicom-toimage"
 version = "0.7.1"
 edition = "2018"
+rust-version = "1.72.0"
 authors = ["Eduardo Pinho <enet4mikeenet@gmail.com>"]
 description = "A CLI tool for converting DICOM files into general purpose image files"
 license = "MIT OR Apache-2.0"

transfer-syntax-registry/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.7.1"
 authors = ["Eduardo Pinho <enet4mikeenet@gmail.com>"]
 description = "A registry of DICOM transfer syntaxes"
 edition = "2018"
+rust-version = "1.72.0"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/Enet4/dicom-rs"
 keywords = ["dicom"]

ul/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.7.1"
 authors = ["Eduardo Pinho <enet4mikeenet@gmail.com>", "Paul Knopf <pauldotknopf@gmail.com>"]
 description = "Types and methods for interacting with the DICOM Upper Layer Protocol"
 edition = "2018"
+rust-version = "1.72.0"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/Enet4/dicom-rs"
 categories = ["network-programming"]