Merge pull request #47 from LebedevRI/develop

Extract fixed_length_load crate

Author: LebedevRI

Cargo.toml

@@ -10,6 +10,7 @@ members = [
     "src/memory/bitstreamcache",
     "src/memory/bitstreamer",
     "src/memory/variable_length_load",
+    "src/memory/fixed_length_load",
     "src/memory/bytevacuumer",
     "src/memory/bytestreamer",
     "src/misc/md5",

src/codecs/packed/decoder/Cargo.toml

@@ -19,6 +19,7 @@ rawspeed-memory-bitstreamcache = { path = "../../../memory/bitstreamcache" }
 rawspeed-memory-bitstreamer = { path = "../../../memory/bitstreamer" }
 rawspeed-memory-endianness = { path = "../../../memory/endianness" }
 rawspeed-memory-variable_length_load = { path = "../../../memory/variable_length_load" }
+rawspeed-memory-fixed_length_load = { path = "../../../memory/fixed_length_load" }
 rawspeed-std = { path = "../../../std" }
 rawspeed-std-ndslice = { path = "../../../std/ndslice" }
 

src/codecs/packed/decoder/packed_decoder/mod.rs

@@ -1,6 +1,4 @@
-use rawspeed_common::bit_transmutation::CopyFromSlice;
 use rawspeed_common::bit_transmutation::FromNeBytes;
-use rawspeed_common::bit_transmutation::LoadFromSlice;
 use rawspeed_common::common::Bitwidth;
 use rawspeed_memory_bitstream::bitstream;
 use rawspeed_memory_bitstream::bitstream::BitOrder;
@@ -11,6 +9,8 @@ use rawspeed_memory_bitstreamer::bitstreamer::BitStreamerBase;
 use rawspeed_memory_bitstreamer::bitstreamer::BitStreamerCacheFillImpl;
 use rawspeed_memory_bitstreamer::bitstreamer::BitStreamerTraits;
 use rawspeed_memory_endianness::endianness::SwapBytes;
+use rawspeed_memory_fixed_length_load::fixed_length_load::CopyFromSlice;
+use rawspeed_memory_fixed_length_load::fixed_length_load::LoadFromSlice;
 use rawspeed_memory_variable_length_load::variable_length_load::VariableLengthLoad;
 use rawspeed_std::coord_common::RowIndex;
 use rawspeed_std_ndslice::array2dref::Array2DRef;

src/common/bit_transmutation/mod.rs

@@ -94,38 +94,6 @@ impl_to_ne_bytes!(u16);
 impl_to_ne_bytes!(u32);
 impl_to_ne_bytes!(u64);
 
-pub trait CopyFromSlice {
-    fn copy_from_slice_(&mut self, src: &[u8]);
-}
-
-impl CopyFromSlice for [u8] {
-    #[inline]
-    fn copy_from_slice_(&mut self, src: &[u8]) {
-        self.copy_from_slice(src);
-    }
-}
-
-pub trait LoadFromSlice<T>
-where
-    T: Default + core::ops::IndexMut<core::ops::RangeFull>,
-    <T as core::ops::Index<core::ops::RangeFull>>::Output: CopyFromSlice,
-{
-    fn load_from_slice(&self) -> T;
-}
-
-impl<T> LoadFromSlice<T> for [u8]
-where
-    T: Default + core::ops::IndexMut<core::ops::RangeFull>,
-    <T as core::ops::Index<core::ops::RangeFull>>::Output: CopyFromSlice,
-{
-    #[inline]
-    fn load_from_slice(&self) -> T {
-        let mut out: T = Default::default();
-        out[..].copy_from_slice_(self);
-        out
-    }
-}
-
 pub trait FromNeBytes {
     type Output;
 

src/memory/bitstreamer/Cargo.toml

@@ -18,6 +18,7 @@ rawspeed-memory-bitstream = { path = "../bitstream" }
 rawspeed-memory-endianness = { path = "../endianness" }
 rawspeed-memory-bitstreamcache = { path = "../bitstreamcache" }
 rawspeed-memory-variable_length_load = { path = "../variable_length_load" }
+rawspeed-memory-fixed_length_load = { path = "../fixed_length_load" }
 
 [lib]
 path = "mod.rs"

src/memory/bitstreamer/bitstreamer/mod.rs

@@ -1,15 +1,15 @@
 use core::marker::PhantomData;
 use core::ops::RangeFull;
-use rawspeed_common::bit_transmutation::CopyFromSlice;
 use rawspeed_common::bit_transmutation::FromNeBytes;
-use rawspeed_common::bit_transmutation::LoadFromSlice;
 use rawspeed_common::common::Bitwidth;
 use rawspeed_memory_bitstream::bitstream::BitOrder;
 use rawspeed_memory_bitstream::bitstream::BitOrderTrait;
 use rawspeed_memory_bitstream::bitstream::BitStreamTraits;
 use rawspeed_memory_bitstreamcache::bitstreamcache::BitStreamCache;
 use rawspeed_memory_endianness::endianness::SwapBytes;
 use rawspeed_memory_endianness::endianness::get_host_endianness;
+use rawspeed_memory_fixed_length_load::fixed_length_load::CopyFromSlice;
+use rawspeed_memory_fixed_length_load::fixed_length_load::LoadFromSlice;
 use rawspeed_memory_variable_length_load::variable_length_load::VariableLengthLoad;
 
 pub trait BitStreamerTraits {

src/memory/bytestreamer/Cargo.toml

@@ -14,6 +14,7 @@ workspace = true
 
 [dependencies]
 rawspeed-memory-endianness = { path = "../endianness" }
+rawspeed-memory-fixed_length_load = { path = "../fixed_length_load" }
 rawspeed-common = { path = "../../common" }
 
 [lib]

src/memory/bytestreamer/bytestreamer/mod.rs

@@ -1,12 +1,12 @@
-use rawspeed_common::bit_transmutation::CopyFromSlice;
 use rawspeed_common::bit_transmutation::FromBits;
 use rawspeed_common::bit_transmutation::FromNeBytes;
-use rawspeed_common::bit_transmutation::LoadFromSlice;
 use rawspeed_common::bit_transmutation::ToBits;
 use rawspeed_common::bit_transmutation::ToNeBytes;
 use rawspeed_memory_endianness::endianness::Endianness;
 use rawspeed_memory_endianness::endianness::SwapBytes;
 use rawspeed_memory_endianness::endianness::get_host_endianness;
+use rawspeed_memory_fixed_length_load::fixed_length_load::CopyFromSlice;
+use rawspeed_memory_fixed_length_load::fixed_length_load::LoadFromSlice;
 
 pub struct ByteStreamer<'a> {
     slice: &'a [u8],

src/memory/fixed_length_load/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "rawspeed-memory-fixed_length_load"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+documentation.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+
+[lints]
+workspace = true
+
+[dependencies]
+
+[lib]
+path = "mod.rs"

src/memory/fixed_length_load/fixed_length_load/mod.rs

@@ -0,0 +1,34 @@
+pub trait CopyFromSlice {
+    fn copy_from_slice_(&mut self, src: &[u8]);
+}
+
+impl CopyFromSlice for [u8] {
+    #[inline]
+    fn copy_from_slice_(&mut self, src: &[u8]) {
+        self.copy_from_slice(src);
+    }
+}
+
+pub trait LoadFromSlice<T>
+where
+    T: Default + core::ops::IndexMut<core::ops::RangeFull>,
+    <T as core::ops::Index<core::ops::RangeFull>>::Output: CopyFromSlice,
+{
+    fn load_from_slice(&self) -> T;
+}
+
+impl<T> LoadFromSlice<T> for [u8]
+where
+    T: Default + core::ops::IndexMut<core::ops::RangeFull>,
+    <T as core::ops::Index<core::ops::RangeFull>>::Output: CopyFromSlice,
+{
+    #[inline]
+    fn load_from_slice(&self) -> T {
+        let mut out: T = Default::default();
+        out[..].copy_from_slice_(self);
+        out
+    }
+}
+
+#[cfg(test)]
+mod tests;