diff options
author | Ms2ger <ms2ger@gmail.com> | 2015-03-21 18:44:39 +0100 |
---|---|---|
committer | Ms2ger <ms2ger@gmail.com> | 2015-03-21 18:44:39 +0100 |
commit | ba87666cdbf4addf9340aad0dd0cf9574b79091c (patch) | |
tree | 6a7b6b4d0a28f0302029f0c82ab3c63290287d6e /components/devtools/protocol.rs | |
parent | 29a36adbe7d87fb38ba9bef3a718c6c823fb5977 (diff) | |
download | servo-ba87666cdbf4addf9340aad0dd0cf9574b79091c.tar.gz servo-ba87666cdbf4addf9340aad0dd0cf9574b79091c.zip |
Update some code that's feature-gated under core.
Diffstat (limited to 'components/devtools/protocol.rs')
-rw-r--r-- | components/devtools/protocol.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/devtools/protocol.rs b/components/devtools/protocol.rs index 07534df139b..6d978a054dd 100644 --- a/components/devtools/protocol.rs +++ b/components/devtools/protocol.rs @@ -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 }), |