neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-07-01 05:29:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Replace DivRem trait with num-integer crate

Browse source
This commit is contained in:
Matthias Schiffer 2023-02-12 23:07:55 +01:00
parent 1049aad03d
commit 96736bd7ed
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
4 changed files with 32 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/types.rs
View file

@ -1,6 +1,6 @@
use std::{
fmt::Debug,
ops::{Div, Index, IndexMut, Rem},
ops::{Index, IndexMut},
};
use itertools::iproduct;
@ -113,26 +113,3 @@ impl<T> IndexMut<ChunkCoords> for ChunkArray<T> {
&mut self.0[index.z.0 as usize][index.x.0 as usize]
}
}
/// Calculate division and remainder at the same time
pub trait DivRem<Rhs>
where
Self: Div<Rhs>,
Self: Rem<Rhs>,
{
/// Returns the result of the division and remainder operations
/// with the same inputs
fn div_rem(self, rhs: Rhs) -> (<Self as Div<Rhs>>::Output, <Self as Rem<Rhs>>::Output);
}
impl<Lhs, Rhs> DivRem<Rhs> for Lhs
where
Self: Div<Rhs>,
Self: Rem<Rhs>,
Self: Copy,
Rhs: Copy,
{
fn div_rem(self, rhs: Rhs) -> (<Self as Div<Rhs>>::Output, <Self as Rem<Rhs>>::Output) {
(self / rhs, self % rhs)
}
}

7
src/world/section.rs
View file

@ -1,4 +1,5 @@
use anyhow::{bail, Context, Result};
use num_integer::div_rem;
use super::de;
use crate::{resource, types::*};
@ -112,11 +113,11 @@ impl<'a> SectionV1_13<'a> {
let shifted = if self.aligned_blocks {
let blocks_per_word = 64 / bits;
let (word, shift) = offset.div_rem(blocks_per_word);
let (word, shift) = div_rem(offset, blocks_per_word);
block_states[word] as u64 >> (shift * bits)
} else {
let bit_offset = offset * bits;
let (word, bit_shift) = bit_offset.div_rem(64);
let (word, bit_shift) = div_rem(bit_offset, 64);
if bit_shift + bits <= 64 {
block_states[word] as u64 >> bit_shift
@ -170,7 +171,7 @@ impl<'a> Section for SectionV0<'a> {
let offset = coords.offset();
let block = self.blocks[offset] as u8;
let (data_offset, data_nibble) = offset.div_rem(2);
let (data_offset, data_nibble) = div_rem(offset, 2);
let data_byte = self.data[data_offset] as u8;
let data = if data_nibble == 1 {
data_byte >> 4