mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Update some code that's feature-gated under core.
This commit is contained in:
parent
29a36adbe7
commit
ba87666cdb
33 changed files with 104 additions and 107 deletions
|
@ -20,9 +20,9 @@ impl JsonPacketStream for TcpStream {
|
|||
fn write_json_packet<'a, T: Encodable>(&mut self, obj: &T) {
|
||||
let s = json::encode(obj).unwrap().replace("__type__", "type");
|
||||
println!("<- {}", s);
|
||||
self.write_str(s.len().to_string().as_slice()).unwrap();
|
||||
self.write_str(&s.len().to_string()).unwrap();
|
||||
self.write_u8(':' as u8).unwrap();
|
||||
self.write_str(s.as_slice()).unwrap();
|
||||
self.write_str(&s).unwrap();
|
||||
}
|
||||
|
||||
fn read_json_packet<'a>(&mut self) -> IoResult<Json> {
|
||||
|
@ -35,11 +35,11 @@ impl JsonPacketStream for TcpStream {
|
|||
Ok(c) if c != colon => buffer.push(c as u8),
|
||||
Ok(_) => {
|
||||
let packet_len_str = String::from_utf8(buffer).unwrap();
|
||||
let packet_len = num::from_str_radix(packet_len_str.as_slice(), 10).unwrap();
|
||||
let packet_len = num::from_str_radix(&packet_len_str, 10).unwrap();
|
||||
let packet_buf = self.read_exact(packet_len).unwrap();
|
||||
let packet = String::from_utf8(packet_buf).unwrap();
|
||||
println!("{}", packet);
|
||||
return Ok(Json::from_str(packet.as_slice()).unwrap())
|
||||
return Ok(Json::from_str(&packet).unwrap())
|
||||
},
|
||||
Err(ref e) if e.kind == EndOfFile =>
|
||||
return Err(IoError { kind: EndOfFile, desc: "EOF", detail: None }),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue