alex/valence
1
0
Fork 0
mirror of https://github.com/italicsjenga/valence.git synced 2024-12-23 22:41:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Improve valence_nbt write perf and remove zerocopy dependency (#174)

Browse source
This commit is contained in:
Ryan Johnson 2022-12-20 20:17:07 -08:00 committed by GitHub
parent 4194acaa67
commit 2fc59d90a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
valence_nbt/Cargo.toml
View file

@ -14,7 +14,6 @@ edition = "2021"
byteorder = "1.4.3" byteorder = "1.4.3"
cesu8 = "1.1.0" cesu8 = "1.1.0"
indexmap = { version = "1.9.1", optional = true } indexmap = { version = "1.9.1", optional = true }
zerocopy = "0.6.1"
[features] [features]
# When enabled, the order of fields in compounds are preserved. # When enabled, the order of fields in compounds are preserved.

8
valence_nbt/src/modified_utf8.rs
View file

@ -83,15 +83,15 @@ pub fn encoded_len(text: &str) -> usize {
while i < bytes.len() { while i < bytes.len() {
match bytes[i] { match bytes[i] {
0 => {
n += 2;
i += 1;
}
// Fast path for ASCII here makes a huge difference in benchmarks. // Fast path for ASCII here makes a huge difference in benchmarks.
1..=127 => { 1..=127 => {
n += 1; n += 1;
i += 1; i += 1;
} }
0 => {
n += 2;
i += 1;
}
b => { b => {
let w = utf8_char_width(b); let w = utf8_char_width(b);

11
valence_nbt/src/to_binary_writer.rs
View file

@ -1,7 +1,6 @@
use std::io::Write; use std::io::Write;
use byteorder::{BigEndian, WriteBytesExt}; use byteorder::{BigEndian, WriteBytesExt};
use zerocopy::AsBytes;
use crate::tag::Tag; use crate::tag::Tag;
use crate::{modified_utf8, Compound, Error, List, Result, Value}; use crate::{modified_utf8, Compound, Error, List, Result, Value};
@ -135,7 +134,10 @@ impl<W: Write> EncodeState<W> {
} }
} }
Ok(self.writer.write_all(bytes.as_bytes())?) // SAFETY: i8 has the same layout as u8.
let bytes: &[u8] = unsafe { std::mem::transmute(bytes) };
Ok(self.writer.write_all(bytes)?)
} }
fn write_string(&mut self, s: &str) -> Result<()> { fn write_string(&mut self, s: &str) -> Result<()> {
@ -177,7 +179,10 @@ impl<W: Write> EncodeState<W> {
} }
} }
Ok(self.writer.write_all(bl.as_bytes())?) // SAFETY: i8 has the same layout as u8.
let bytes: &[u8] = unsafe { std::mem::transmute(bl.as_slice()) };
Ok(self.writer.write_all(bytes)?)
} }
List::Short(sl) => self.write_list(sl, Tag::Short, |st, s| st.write_short(*s)), List::Short(sl) => self.write_list(sl, Tag::Short, |st, s| st.write_short(*s)),
List::Int(il) => self.write_list(il, Tag::Int, |st, i| st.write_int(*i)), List::Int(il) => self.write_list(il, Tag::Int, |st, i| st.write_int(*i)),