mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify IntEncodedWithFixedSize.

Browse Source
This commit is contained in:
Camille GILLOT 2021-03-18 18:54:01 +01:00
parent 5003b3dc31
commit e5d09fbbe9
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_serialize/src/lib.rs
View File

@ -17,6 +17,8 @@
#![feature(vec_spare_capacity)]
#![feature(core_intrinsics)]
#![feature(int_bits_const)]
#![feature(maybe_uninit_array_assume_init)]
#![feature(maybe_uninit_uninit_array)]
#![feature(maybe_uninit_slice)]
#![feature(new_uninit)]
#![cfg_attr(test, feature(test))]

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

@ -729,9 +729,7 @@ impl IntEncodedWithFixedSize {
impl serialize::Encodable<Encoder> for IntEncodedWithFixedSize {
fn encode(&self, e: &mut Encoder) -> EncodeResult {
let start_pos = e.position();
for i in 0..IntEncodedWithFixedSize::ENCODED_SIZE {
((self.0 >> (i * 8)) as u8).encode(e)?;
}
e.emit_raw_bytes(&self.0.to_le_bytes());
let end_pos = e.position();
assert_eq!((end_pos - start_pos), IntEncodedWithFixedSize::ENCODED_SIZE);
Ok(())
@ -741,9 +739,7 @@ fn encode(&self, e: &mut Encoder) -> EncodeResult {
impl serialize::Encodable<FileEncoder> for IntEncodedWithFixedSize {
fn encode(&self, e: &mut FileEncoder) -> FileEncodeResult {
let start_pos = e.position();
for i in 0..IntEncodedWithFixedSize::ENCODED_SIZE {
((self.0 >> (i * 8)) as u8).encode(e)?;
}
e.emit_raw_bytes(&self.0.to_le_bytes())?;
let end_pos = e.position();
assert_eq!((end_pos - start_pos), IntEncodedWithFixedSize::ENCODED_SIZE);
Ok(())
@ -752,17 +748,13 @@ fn encode(&self, e: &mut FileEncoder) -> FileEncodeResult {
impl<'a> serialize::Decodable<Decoder<'a>> for IntEncodedWithFixedSize {
fn decode(decoder: &mut Decoder<'a>) -> Result<IntEncodedWithFixedSize, String> {
let mut value: u64 = 0;
let mut bytes = MaybeUninit::uninit_array();
let start_pos = decoder.position();
for i in 0..IntEncodedWithFixedSize::ENCODED_SIZE {
let byte: u8 = serialize::Decodable::decode(decoder)?;
value |= (byte as u64) << (i * 8);
}
decoder.read_raw_bytes(&mut bytes)?;
let end_pos = decoder.position();
assert_eq!((end_pos - start_pos), IntEncodedWithFixedSize::ENCODED_SIZE);
let value = u64::from_le_bytes(unsafe { MaybeUninit::array_assume_init(bytes) });
Ok(IntEncodedWithFixedSize(value))
}
}