summaryrefslogtreecommitdiff
path: root/shared/src/helper.rs
diff options
context:
space:
mode:
Diffstat (limited to 'shared/src/helper.rs')
-rw-r--r--shared/src/helper.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/shared/src/helper.rs b/shared/src/helper.rs
index 4702aef..d267f68 100644
--- a/shared/src/helper.rs
+++ b/shared/src/helper.rs
@@ -39,7 +39,7 @@ impl ReadWrite for f32 {
Ok(())
}
fn read(r: &mut dyn Read) -> Result<Self> {
- let mut buf = [0; 4];
+ let mut buf = [0; { size_of::<f32>() }];
r.read_exact(&mut buf)?;
Ok(f32::from_be_bytes(buf))
}
@@ -50,7 +50,7 @@ impl ReadWrite for u32 {
Ok(())
}
fn read(r: &mut dyn Read) -> Result<Self> {
- let mut buf = [0; 4];
+ let mut buf = [0; { size_of::<u32>() }];
r.read_exact(&mut buf)?;
Ok(u32::from_be_bytes(buf))
}
@@ -78,7 +78,7 @@ impl ReadWrite for Vec<Vec3A> {
r.read_to_end(&mut buf)?;
Ok(buf
.into_iter()
- .array_chunks::<4>()
+ .array_chunks::<{ size_of::<f32>() }>()
.map(f32::from_be_bytes)
.array_chunks::<3>()
.map(Vec3A::from_array)
@@ -97,7 +97,7 @@ impl ReadWrite for Vec<Vec2> {
r.read_to_end(&mut buf)?;
Ok(buf
.into_iter()
- .array_chunks::<4>()
+ .array_chunks::<{ size_of::<f32>() }>()
.map(f32::from_be_bytes)
.array_chunks::<2>()
.map(Vec2::from_array)
@@ -118,7 +118,7 @@ impl ReadWrite for Vec<[u32; 3]> {
r.read_to_end(&mut buf)?;
Ok(buf
.into_iter()
- .array_chunks::<4>()
+ .array_chunks::<{ size_of::<u32>() }>()
.map(u32::from_be_bytes)
.array_chunks::<3>()
.collect())
@@ -136,7 +136,7 @@ impl ReadWrite for Vec<f32> {
r.read_to_end(&mut buf)?;
Ok(buf
.into_iter()
- .array_chunks::<4>()
+ .array_chunks::<{ size_of::<f32>() }>()
.map(f32::from_be_bytes)
.collect())
}
@@ -160,7 +160,7 @@ impl ReadWrite for Data {
Ok(())
}
fn read(r: &mut dyn Read) -> Result<Self> {
- let mut size = [0; 4];
+ let mut size = [0; { size_of::<u32>() }];
r.read_exact(&mut size)?;
let size = u32::from_be_bytes(size);
let mut buf = vec![0; size as usize];