nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #92314 - Kobzol:encoding-u16-leb128, r=michaelwoerister

Browse Source 
Do not use LEB128 for encoding u16 and i16

An experiment to try out the suggestion from https://github.com/rust-lang/rust/issues/68779.

Closes: https://github.com/rust-lang/rust/issues/68779
This commit is contained in:
bors 2022-01-03 20:30:23 +00:00
commit 399ba6bb37
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
compiler/rustc_serialize/src/opaque.rs
View File

@ -92,7 +92,8 @@ impl serialize::Encoder for Encoder {
#[inline] #[inline]
fn emit_u16(&mut self, v: u16) -> EncodeResult { fn emit_u16(&mut self, v: u16) -> EncodeResult {
write_leb128!(self, v, u16, write_u16_leb128) self.data.extend_from_slice(&v.to_le_bytes());
Ok(())
} }
#[inline] #[inline]
@ -123,7 +124,8 @@ impl serialize::Encoder for Encoder {
#[inline] #[inline]
fn emit_i16(&mut self, v: i16) -> EncodeResult { fn emit_i16(&mut self, v: i16) -> EncodeResult {
write_leb128!(self, v, i16, write_i16_leb128) self.data.extend_from_slice(&v.to_le_bytes());
Ok(())
} }
#[inline] #[inline]
@ -446,7 +448,7 @@ impl serialize::Encoder for FileEncoder {
#[inline] #[inline]
fn emit_u16(&mut self, v: u16) -> FileEncodeResult { fn emit_u16(&mut self, v: u16) -> FileEncodeResult {
file_encoder_write_leb128!(self, v, u16, write_u16_leb128) self.write_all(&v.to_le_bytes())
} }
#[inline] #[inline]
@ -476,13 +478,12 @@ impl serialize::Encoder for FileEncoder {
#[inline] #[inline]
fn emit_i16(&mut self, v: i16) -> FileEncodeResult { fn emit_i16(&mut self, v: i16) -> FileEncodeResult {
file_encoder_write_leb128!(self, v, i16, write_i16_leb128) self.write_all(&v.to_le_bytes())
} }
#[inline] #[inline]
fn emit_i8(&mut self, v: i8) -> FileEncodeResult { fn emit_i8(&mut self, v: i8) -> FileEncodeResult {
let as_u8: u8 = unsafe { std::mem::transmute(v) }; self.emit_u8(v as u8)
self.emit_u8(as_u8)
} }
#[inline] #[inline]
@ -591,7 +592,10 @@ impl<'a> serialize::Decoder for Decoder<'a> {
#[inline] #[inline]
fn read_u16(&mut self) -> Result<u16, Self::Error> { fn read_u16(&mut self) -> Result<u16, Self::Error> {
read_leb128!(self, read_u16_leb128) let bytes = [self.data[self.position], self.data[self.position + 1]];
let value = u16::from_le_bytes(bytes);
self.position += 2;
Ok(value)
} }
#[inline] #[inline]
@ -623,7 +627,10 @@ impl<'a> serialize::Decoder for Decoder<'a> {
#[inline] #[inline]
fn read_i16(&mut self) -> Result<i16, Self::Error> { fn read_i16(&mut self) -> Result<i16, Self::Error> {
read_leb128!(self, read_i16_leb128) let bytes = [self.data[self.position], self.data[self.position + 1]];
let value = i16::from_le_bytes(bytes);
self.position += 2;
Ok(value)
} }
#[inline] #[inline]