aboutsummaryrefslogtreecommitdiff
path: root/azalea-buf/src
diff options
context:
space:
mode:
authormat <github@matdoes.dev>2022-06-25 02:33:28 -0500
committermat <github@matdoes.dev>2022-06-25 02:33:28 -0500
commitcd9a05e5a62190b3d4a2a733bf637d6324aec5fd (patch)
tree15fb360678dfb5e8d81330144b810735b73f6ef4 /azalea-buf/src
parentc9faf25fab4f89319731fec87ad4d2cf45864632 (diff)
downloadazalea-drasl-cd9a05e5a62190b3d4a2a733bf637d6324aec5fd.tar.xz
read_into -> read_from
yeah
Diffstat (limited to 'azalea-buf/src')
-rw-r--r--azalea-buf/src/definitions.rs4
-rw-r--r--azalea-buf/src/read.rs62
-rw-r--r--azalea-buf/src/serializable_uuid.rs2
3 files changed, 34 insertions, 34 deletions
diff --git a/azalea-buf/src/definitions.rs b/azalea-buf/src/definitions.rs
index 921fb63d..f3452bea 100644
--- a/azalea-buf/src/definitions.rs
+++ b/azalea-buf/src/definitions.rs
@@ -42,9 +42,9 @@ impl BitSet {
}
impl McBufReadable for BitSet {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
Ok(Self {
- data: Vec::<u64>::read_into(buf)?,
+ data: Vec::<u64>::read_from(buf)?,
})
}
}
diff --git a/azalea-buf/src/read.rs b/azalea-buf/src/read.rs
index 569a5b1d..92c4d79b 100644
--- a/azalea-buf/src/read.rs
+++ b/azalea-buf/src/read.rs
@@ -201,31 +201,31 @@ pub trait McBufReadable
where
Self: Sized,
{
- fn read_into(buf: &mut impl Read) -> Result<Self, String>;
+ fn read_from(buf: &mut impl Read) -> Result<Self, String>;
}
pub trait McBufVarReadable
where
Self: Sized,
{
- fn var_read_into(buf: &mut impl Read) -> Result<Self, String>;
+ fn var_read_from(buf: &mut impl Read) -> Result<Self, String>;
}
impl McBufReadable for i32 {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
Readable::read_int(buf)
}
}
impl McBufVarReadable for i32 {
- fn var_read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn var_read_from(buf: &mut impl Read) -> Result<Self, String> {
buf.read_varint()
}
}
impl McBufVarReadable for i64 {
// fast varints modified from https://github.com/luojia65/mc-varint/blob/master/src/lib.rs#L54
- fn var_read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn var_read_from(buf: &mut impl Read) -> Result<Self, String> {
let mut buffer = [0];
let mut ans = 0;
for i in 0..8 {
@@ -240,139 +240,139 @@ impl McBufVarReadable for i64 {
}
}
impl McBufVarReadable for u64 {
- fn var_read_into(buf: &mut impl Read) -> Result<Self, String> {
- i64::var_read_into(buf).map(|i| i as u64)
+ fn var_read_from(buf: &mut impl Read) -> Result<Self, String> {
+ i64::var_read_from(buf).map(|i| i as u64)
}
}
impl McBufReadable for UnsizedByteArray {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
Ok(buf.read_bytes()?.into())
}
}
impl<T: McBufReadable + Send> McBufReadable for Vec<T> {
- default fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ default fn read_from(buf: &mut impl Read) -> Result<Self, String> {
let length = buf.read_varint()? as usize;
let mut contents = Vec::with_capacity(length);
for _ in 0..length {
- contents.push(T::read_into(buf)?);
+ contents.push(T::read_from(buf)?);
}
Ok(contents)
}
}
impl<K: McBufReadable + Send + Eq + Hash, V: McBufReadable + Send> McBufReadable for HashMap<K, V> {
- default fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ default fn read_from(buf: &mut impl Read) -> Result<Self, String> {
let length = buf.read_varint()? as usize;
let mut contents = HashMap::with_capacity(length);
for _ in 0..length {
- contents.insert(K::read_into(buf)?, V::read_into(buf)?);
+ contents.insert(K::read_from(buf)?, V::read_from(buf)?);
}
Ok(contents)
}
}
impl McBufReadable for Vec<u8> {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
buf.read_byte_array()
}
}
impl McBufReadable for String {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
buf.read_utf()
}
}
impl McBufReadable for u32 {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
Readable::read_int(buf).map(|i| i as u32)
}
}
impl McBufVarReadable for u32 {
- fn var_read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn var_read_from(buf: &mut impl Read) -> Result<Self, String> {
buf.read_varint().map(|i| i as u32)
}
}
impl McBufReadable for u16 {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
buf.read_short().map(|i| i as u16)
}
}
impl McBufReadable for i16 {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
buf.read_short()
}
}
impl McBufVarReadable for u16 {
- fn var_read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn var_read_from(buf: &mut impl Read) -> Result<Self, String> {
buf.read_varint().map(|i| i as u16)
}
}
impl<T: McBufVarReadable> McBufVarReadable for Vec<T> {
- fn var_read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn var_read_from(buf: &mut impl Read) -> Result<Self, String> {
let length = buf.read_varint()? as usize;
let mut contents = Vec::with_capacity(length);
for _ in 0..length {
- contents.push(T::var_read_into(buf)?);
+ contents.push(T::var_read_from(buf)?);
}
Ok(contents)
}
}
impl McBufReadable for i64 {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
buf.read_long()
}
}
impl McBufReadable for u64 {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
- i64::read_into(buf).map(|i| i as u64)
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
+ i64::read_from(buf).map(|i| i as u64)
}
}
impl McBufReadable for bool {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
buf.read_boolean()
}
}
impl McBufReadable for u8 {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
buf.read_byte()
}
}
impl McBufReadable for i8 {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
buf.read_byte().map(|i| i as i8)
}
}
impl McBufReadable for f32 {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
buf.read_float()
}
}
impl McBufReadable for f64 {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
buf.read_double()
}
}
impl<T: McBufReadable> McBufReadable for Option<T> {
- default fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ default fn read_from(buf: &mut impl Read) -> Result<Self, String> {
let present = buf.read_boolean()?;
Ok(if present {
- Some(T::read_into(buf)?)
+ Some(T::read_from(buf)?)
} else {
None
})
diff --git a/azalea-buf/src/serializable_uuid.rs b/azalea-buf/src/serializable_uuid.rs
index 10921aa6..eb256d90 100644
--- a/azalea-buf/src/serializable_uuid.rs
+++ b/azalea-buf/src/serializable_uuid.rs
@@ -33,7 +33,7 @@ impl SerializableUuid for Uuid {
}
impl McBufReadable for Uuid {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
Ok(Uuid::from_int_array([
Readable::read_int(buf)? as u32,
Readable::read_int(buf)? as u32,