Skip to content

syntax: Fix encoding and decoding spans #31028

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
merged 1 commit into from
Jan 21, 2016
Merged

syntax: Fix encoding and decoding spans #31028

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
25 changes: 20 additions & 5 deletions src/libsyntax/codemap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,16 +164,31 @@ impl Eq for Span {}

impl Encodable for Span {
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
try!(s.emit_u32(self.lo.0));
s.emit_u32(self.hi.0)
s.emit_struct("Span", 2, |s| {
try!(s.emit_struct_field("lo", 0, |s| {
self.lo.encode(s)
}));

s.emit_struct_field("hi", 1, |s| {
self.hi.encode(s)
})
})
}
}

impl Decodable for Span {
fn decode<D: Decoder>(d: &mut D) -> Result<Span, D::Error> {
let lo = BytePos(try! { d.read_u32() });
let hi = BytePos(try! { d.read_u32() });
Ok(mk_sp(lo, hi))
d.read_struct("Span", 2, |d| {
let lo = try!(d.read_struct_field("lo", 0, |d| {
BytePos::decode(d)
}));

let hi = try!(d.read_struct_field("hi", 1, |d| {
BytePos::decode(d)
}));

Ok(mk_sp(lo, hi))
})
}
}

Expand Down