Skip to content

proc_macro: stop using LEB128 for RPC. #59820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 1 commit into from
Apr 13, 2019
Merged

proc_macro: stop using LEB128 for RPC. #59820

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 13 additions & 23 deletions src/libproc_macro/bridge/rpc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,22 @@ pub(super) trait DecodeMut<'a, 's, S>: Sized {
}

macro_rules! rpc_encode_decode {
(uleb128 $ty:ty) => {
(le $ty:ty) => {
impl<S> Encode<S> for $ty {
fn encode(mut self, w: &mut Writer, s: &mut S) {
let mut byte = 0x80;
while byte & 0x80 != 0 {
byte = (self & 0x7f) as u8;
self >>= 7;
if self != 0 {
byte |= 0x80;
}
byte.encode(w, s);
}
fn encode(self, w: &mut Writer, _: &mut S) {
w.write_all(&self.to_le_bytes()).unwrap();
}
}

impl<S> DecodeMut<'_, '_, S> for $ty {
fn decode(r: &mut Reader<'_>, s: &mut S) -> Self {
let mut byte = 0x80;
let mut v = 0;
let mut shift = 0;
while byte & 0x80 != 0 {
byte = u8::decode(r, s);
v |= ((byte & 0x7f) as Self) << shift;
shift += 7;
}
v
fn decode(r: &mut Reader<'_>, _: &mut S) -> Self {
const N: usize = ::std::mem::size_of::<$ty>();

let mut bytes = [0; N];
bytes.copy_from_slice(&r[..N]);
*r = &r[N..];

Self::from_le_bytes(bytes)
}
}
};
Expand Down Expand Up @@ -136,8 +126,8 @@ impl<S> DecodeMut<'_, '_, S> for u8 {
}
}

rpc_encode_decode!(uleb128 u32);
rpc_encode_decode!(uleb128 usize);
rpc_encode_decode!(le u32);
rpc_encode_decode!(le usize);

impl<S> Encode<S> for bool {
fn encode(self, w: &mut Writer, s: &mut S) {
Expand Down