pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-14 02:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Port serde2 to std::io, which cuts the speed by 26% :(

Browse Source
This commit is contained in:
Erick Tryzelaar
2015-02-16 18:17:50 -08:00
parent 4e4172ec85
commit 65cfcd03f8
7 changed files with 440 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
benches/bench_log.rs
+18 -18
View File
@@ -50,7 +50,7 @@ impl rustc_serialize::Decodable for HttpProtocol {
fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<HttpProtocol, D::Error> { fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<HttpProtocol, D::Error> {
match FromPrimitive::from_uint(try!(d.read_usize())) { match FromPrimitive::from_uint(try!(d.read_usize())) {
Some(value) => Ok(value), Some(value) => Ok(value),
None => Err(d.error("cannot convert from uint")), None => Err(d.error("cannot convert from usize")),
} }
} }
} }
@@ -58,7 +58,7 @@ impl rustc_serialize::Decodable for HttpProtocol {
impl<S: ser::Serializer<E>, E> ser::Serialize<S, E> for HttpProtocol { impl<S: ser::Serializer<E>, E> ser::Serialize<S, E> for HttpProtocol {
#[inline] #[inline]
fn serialize(&self, s: &mut S) -> Result<(), E> { fn serialize(&self, s: &mut S) -> Result<(), E> {
s.serialize_usize(*self as usize) s.serialize_u8(*self as u8)
} }
} }
@@ -102,7 +102,7 @@ impl rustc_serialize::Decodable for HttpMethod {
impl<S: ser::Serializer<E>, E> ser::Serialize<S, E> for HttpMethod { impl<S: ser::Serializer<E>, E> ser::Serialize<S, E> for HttpMethod {
#[inline] #[inline]
fn serialize(&self, s: &mut S) -> Result<(), E> { fn serialize(&self, s: &mut S) -> Result<(), E> {
s.serialize_usize(*self as usize) s.serialize_u8(*self as u8)
} }
} }
@@ -123,15 +123,15 @@ enum CacheStatus {
impl rustc_serialize::Encodable for CacheStatus { impl rustc_serialize::Encodable for CacheStatus {
fn encode<S: rustc_serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: rustc_serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
(*self as usize).encode(s) (*self as u8).encode(s)
} }
} }
impl rustc_serialize::Decodable for CacheStatus { impl rustc_serialize::Decodable for CacheStatus {
fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<CacheStatus, D::Error> { fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<CacheStatus, D::Error> {
match FromPrimitive::from_uint(try!(d.read_usize())) { match FromPrimitive::from_u8(try!(d.read_u8())) {
Some(value) => Ok(value), Some(value) => Ok(value),
None => Err(d.error("cannot convert from usize")), None => Err(d.error("cannot convert from u8")),
} }
} }
} }
@@ -169,15 +169,15 @@ enum OriginProtocol {
impl rustc_serialize::Encodable for OriginProtocol { impl rustc_serialize::Encodable for OriginProtocol {
fn encode<S: rustc_serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: rustc_serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
(*self as usize).encode(s) (*self as u8).encode(s)
} }
} }
impl rustc_serialize::Decodable for OriginProtocol { impl rustc_serialize::Decodable for OriginProtocol {
fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<OriginProtocol, D::Error> { fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<OriginProtocol, D::Error> {
match FromPrimitive::from_uint(try!(d.read_usize())) { match FromPrimitive::from_u8(try!(d.read_u8())) {
Some(value) => Ok(value), Some(value) => Ok(value),
None => Err(d.error("cannot convert from usize")), None => Err(d.error("cannot convert from u8")),
} }
} }
} }
@@ -185,7 +185,7 @@ impl rustc_serialize::Decodable for OriginProtocol {
impl<S: ser::Serializer<E>, E> ser::Serialize<S, E> for OriginProtocol { impl<S: ser::Serializer<E>, E> ser::Serialize<S, E> for OriginProtocol {
#[inline] #[inline]
fn serialize(&self, s: &mut S) -> Result<(), E> { fn serialize(&self, s: &mut S) -> Result<(), E> {
s.serialize_usize(*self as usize) s.serialize_u8(*self as u8)
} }
} }
@@ -207,15 +207,15 @@ enum ZonePlan {
impl rustc_serialize::Encodable for ZonePlan { impl rustc_serialize::Encodable for ZonePlan {
fn encode<S: rustc_serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: rustc_serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
(*self as usize).encode(s) (*self as u8).encode(s)
} }
} }
impl rustc_serialize::Decodable for ZonePlan { impl rustc_serialize::Decodable for ZonePlan {
fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<ZonePlan, D::Error> { fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<ZonePlan, D::Error> {
match FromPrimitive::from_uint(try!(d.read_usize())) { match FromPrimitive::from_u8(try!(d.read_u8())) {
Some(value) => Ok(value), Some(value) => Ok(value),
None => Err(d.error("cannot convert from usize")), None => Err(d.error("cannot convert from u8")),
} }
} }
} }
@@ -223,7 +223,7 @@ impl rustc_serialize::Decodable for ZonePlan {
impl<S: ser::Serializer<E>, E> ser::Serialize<S, E> for ZonePlan { impl<S: ser::Serializer<E>, E> ser::Serialize<S, E> for ZonePlan {
#[inline] #[inline]
fn serialize(&self, s: &mut S) -> Result<(), E> { fn serialize(&self, s: &mut S) -> Result<(), E> {
s.serialize_usize(*self as usize) s.serialize_u8(*self as u8)
} }
} }
@@ -496,15 +496,15 @@ enum Country {
impl rustc_serialize::Encodable for Country { impl rustc_serialize::Encodable for Country {
fn encode<S: rustc_serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: rustc_serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
(*self as usize).encode(s) (*self as u8).encode(s)
} }
} }
impl rustc_serialize::Decodable for Country { impl rustc_serialize::Decodable for Country {
fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<Country, D::Error> { fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<Country, D::Error> {
match FromPrimitive::from_uint(try!(d.read_usize())) { match FromPrimitive::from_u8(try!(d.read_u8())) {
Some(value) => Ok(value), Some(value) => Ok(value),
None => Err(d.error("cannot convert from usize")), None => Err(d.error("cannot convert from u8")),
} }
} }
} }
@@ -512,7 +512,7 @@ impl rustc_serialize::Decodable for Country {
impl<S: ser::Serializer<E>, E> ser::Serialize<S, E> for Country { impl<S: ser::Serializer<E>, E> ser::Serialize<S, E> for Country {
#[inline] #[inline]
fn serialize(&self, s: &mut S) -> Result<(), E> { fn serialize(&self, s: &mut S) -> Result<(), E> {
s.serialize_usize(*self as usize) s.serialize_u8(*self as u8)
} }
} }
serde2/benches/bench_log.rs
+107 -98
View File
@@ -6,17 +6,16 @@ extern crate serde2;
extern crate "rustc-serialize" as rustc_serialize; extern crate "rustc-serialize" as rustc_serialize;
extern crate test; extern crate test;
use std::old_io; use std::io::{self, ReadExt, WriteExt};
use std::old_io::ByRefWriter;
use std::num::FromPrimitive; use std::num::FromPrimitive;
use test::Bencher; use test::Bencher;
use serde2::de::{Deserialize, Deserializer};
use serde2::de;
use serde2::json::ser::escape_str; use serde2::json::ser::escape_str;
use serde2::json; use serde2::json;
use serde2::ser::{Serialize, Serializer}; use serde2::ser::{Serialize, Serializer};
use serde2::ser; use serde2::ser;
use serde2::de::{Deserialize, Deserializer};
use serde2::de;
use rustc_serialize::Encodable; use rustc_serialize::Encodable;
@@ -44,15 +43,15 @@ enum HttpProtocol {
impl rustc_serialize::Encodable for HttpProtocol { impl rustc_serialize::Encodable for HttpProtocol {
fn encode<S: rustc_serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: rustc_serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
(*self as u8).encode(s) (*self as usize).encode(s)
} }
} }
impl rustc_serialize::Decodable for HttpProtocol { impl rustc_serialize::Decodable for HttpProtocol {
fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<HttpProtocol, D::Error> { fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<HttpProtocol, D::Error> {
match FromPrimitive::from_u8(try!(d.read_u8())) { match FromPrimitive::from_uint(try!(d.read_usize())) {
Some(value) => Ok(value), Some(value) => Ok(value),
None => Err(d.error("cannot convert from u8")), None => Err(d.error("cannot convert from usize")),
} }
} }
} }
@@ -92,15 +91,15 @@ enum HttpMethod {
impl rustc_serialize::Encodable for HttpMethod { impl rustc_serialize::Encodable for HttpMethod {
fn encode<S: rustc_serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> { fn encode<S: rustc_serialize::Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
(*self as u8).encode(s) (*self as usize).encode(s)
} }
} }
impl rustc_serialize::Decodable for HttpMethod { impl rustc_serialize::Decodable for HttpMethod {
fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<HttpMethod, D::Error> { fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<HttpMethod, D::Error> {
match FromPrimitive::from_u8(try!(d.read_u8())) { match FromPrimitive::from_uint(try!(d.read_usize())) {
Some(value) => Ok(value), Some(value) => Ok(value),
None => Err(d.error("cannot convert from u8")), None => Err(d.error("cannot convert from usize")),
} }
} }
} }
@@ -141,7 +140,7 @@ impl rustc_serialize::Decodable for CacheStatus {
fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<CacheStatus, D::Error> { fn decode<D: rustc_serialize::Decoder>(d: &mut D) -> Result<CacheStatus, D::Error> {
match FromPrimitive::from_u8(try!(d.read_u8())) { match FromPrimitive::from_u8(try!(d.read_u8())) {
Some(value) => Ok(value), Some(value) => Ok(value),
None => Err(d.error("cannot convert from uint")), None => Err(d.error("cannot convert from u8")),
} }
} }
} }
@@ -640,10 +639,15 @@ impl MyMemWriter0 {
} }
impl Writer for MyMemWriter0 { impl io::Write for MyMemWriter0 {
#[inline] #[inline]
fn write_all(&mut self, buf: &[u8]) -> old_io::IoResult<()> { fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
self.buf.push_all(buf); self.buf.push_all(buf);
Ok(buf.len())
}
#[inline]
fn flush(&mut self) -> io::Result<()> {
Ok(()) Ok(())
} }
} }
@@ -680,10 +684,15 @@ fn push_all_bytes(dst: &mut Vec<u8>, src: &[u8]) {
} }
} }
impl Writer for MyMemWriter1 { impl io::Write for MyMemWriter1 {
#[inline] #[inline]
fn write_all(&mut self, buf: &[u8]) -> old_io::IoResult<()> { fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
push_all_bytes(&mut self.buf, buf); push_all_bytes(&mut self.buf, buf);
Ok(buf.len())
}
#[inline]
fn flush(&mut self) -> io::Result<()> {
Ok(()) Ok(())
} }
} }
@@ -730,14 +739,14 @@ fn bench_encoder(b: &mut Bencher) {
#[test] #[test]
fn test_serializer() { fn test_serializer() {
let log = Log::new(); let log = Log::new();
let json = json::to_vec(&log).unwrap(); let json = json::to_vec(&log);
assert_eq!(json, JSON_STR.as_bytes()); assert_eq!(json, JSON_STR.as_bytes());
} }
#[bench] #[bench]
fn bench_serializer(b: &mut Bencher) { fn bench_serializer(b: &mut Bencher) {
let log = Log::new(); let log = Log::new();
let json = json::to_vec(&log).unwrap(); let json = json::to_vec(&log);
b.bytes = json.len() as u64; b.bytes = json.len() as u64;
b.iter(|| { b.iter(|| {
@@ -759,7 +768,7 @@ fn test_serializer_vec() {
#[bench] #[bench]
fn bench_serializer_vec(b: &mut Bencher) { fn bench_serializer_vec(b: &mut Bencher) {
let log = Log::new(); let log = Log::new();
let json = json::to_vec(&log).unwrap(); let json = json::to_vec(&log);
b.bytes = json.len() as u64; b.bytes = json.len() as u64;
let mut wr = Vec::with_capacity(1024); let mut wr = Vec::with_capacity(1024);
@@ -776,14 +785,14 @@ fn bench_serializer_vec(b: &mut Bencher) {
#[bench] #[bench]
fn bench_serializer_slice(b: &mut Bencher) { fn bench_serializer_slice(b: &mut Bencher) {
let log = Log::new(); let log = Log::new();
let json = json::to_vec(&log).unwrap(); let json = json::to_vec(&log);
b.bytes = json.len() as u64; b.bytes = json.len() as u64;
let mut buf = [0; 1024]; let mut buf = [0; 1024];
b.iter(|| { b.iter(|| {
for item in buf.iter_mut(){ *item = 0; } for item in buf.iter_mut(){ *item = 0; }
let mut wr = std::old_io::BufWriter::new(&mut buf); let mut wr = &mut buf[];
let mut serializer = json::Writer::new(wr.by_ref()); let mut serializer = json::Writer::new(wr.by_ref());
serializer.visit(&log).unwrap(); serializer.visit(&log).unwrap();
@@ -809,7 +818,7 @@ fn test_serializer_my_mem_writer0() {
#[bench] #[bench]
fn bench_serializer_my_mem_writer0(b: &mut Bencher) { fn bench_serializer_my_mem_writer0(b: &mut Bencher) {
let log = Log::new(); let log = Log::new();
let json = json::to_vec(&log).unwrap(); let json = json::to_vec(&log);
b.bytes = json.len() as u64; b.bytes = json.len() as u64;
let mut wr = MyMemWriter0::with_capacity(1024); let mut wr = MyMemWriter0::with_capacity(1024);
@@ -841,7 +850,7 @@ fn test_serializer_my_mem_writer1() {
#[bench] #[bench]
fn bench_serializer_my_mem_writer1(b: &mut Bencher) { fn bench_serializer_my_mem_writer1(b: &mut Bencher) {
let log = Log::new(); let log = Log::new();
let json = json::to_vec(&log).unwrap(); let json = json::to_vec(&log);
b.bytes = json.len() as u64; b.bytes = json.len() as u64;
let mut wr = MyMemWriter1::with_capacity(1024); let mut wr = MyMemWriter1::with_capacity(1024);
@@ -865,166 +874,166 @@ fn bench_copy(b: &mut Bencher) {
}); });
} }
fn manual_serialize_no_escape<W: Writer>(wr: &mut W, log: &Log) { fn manual_serialize_no_escape<W: io::Write>(wr: &mut W, log: &Log) {
wr.write_str("{\"timestamp\":").unwrap(); wr.write(b"{\"timestamp\":").unwrap();
(write!(wr, "{}", log.timestamp)).unwrap(); (write!(wr, "{}", log.timestamp)).unwrap();
wr.write_str(",\"zone_id\":").unwrap(); wr.write(b",\"zone_id\":").unwrap();
(write!(wr, "{}", log.zone_id)).unwrap(); (write!(wr, "{}", log.zone_id)).unwrap();
wr.write_str(",\"zone_plan\":").unwrap(); wr.write(b",\"zone_plan\":").unwrap();
(write!(wr, "{}", log.zone_plan as usize)).unwrap(); (write!(wr, "{}", log.zone_plan as usize)).unwrap();
wr.write_str(",\"http\":{\"protocol\":").unwrap(); wr.write(b",\"http\":{\"protocol\":").unwrap();
(write!(wr, "{}", log.http.protocol as usize)).unwrap(); (write!(wr, "{}", log.http.protocol as usize)).unwrap();
wr.write_str(",\"status\":").unwrap(); wr.write(b",\"status\":").unwrap();
(write!(wr, "{}", log.http.status)).unwrap(); (write!(wr, "{}", log.http.status)).unwrap();
wr.write_str(",\"host_status\":").unwrap(); wr.write(b",\"host_status\":").unwrap();
(write!(wr, "{}", log.http.host_status)).unwrap(); (write!(wr, "{}", log.http.host_status)).unwrap();
wr.write_str(",\"up_status\":").unwrap(); wr.write(b",\"up_status\":").unwrap();
(write!(wr, "{}", log.http.up_status)).unwrap(); (write!(wr, "{}", log.http.up_status)).unwrap();
wr.write_str(",\"method\":").unwrap(); wr.write(b",\"method\":").unwrap();
(write!(wr, "{}", log.http.method as usize)).unwrap(); (write!(wr, "{}", log.http.method as usize)).unwrap();
wr.write_str(",\"content_type\":").unwrap(); wr.write(b",\"content_type\":").unwrap();
(write!(wr, "\"{}\"", log.http.content_type)).unwrap(); (write!(wr, "\"{}\"", log.http.content_type)).unwrap();
wr.write_str(",\"user_agent\":").unwrap(); wr.write(b",\"user_agent\":").unwrap();
(write!(wr, "\"{}\"", log.http.user_agent)).unwrap(); (write!(wr, "\"{}\"", log.http.user_agent)).unwrap();
wr.write_str(",\"referer\":").unwrap(); wr.write(b",\"referer\":").unwrap();
(write!(wr, "\"{}\"", log.http.referer)).unwrap(); (write!(wr, "\"{}\"", log.http.referer)).unwrap();
wr.write_str(",\"request_uri\":").unwrap(); wr.write(b",\"request_uri\":").unwrap();
(write!(wr, "\"{}\"", log.http.request_uri)).unwrap(); (write!(wr, "\"{}\"", log.http.request_uri)).unwrap();
wr.write_str("},\"origin\":{").unwrap(); wr.write(b"},\"origin\":{").unwrap();
wr.write_str("\"ip\":").unwrap(); wr.write(b"\"ip\":").unwrap();
(write!(wr, "\"{}\"", log.origin.ip)).unwrap(); (write!(wr, "\"{}\"", log.origin.ip)).unwrap();
wr.write_str(",\"port\":").unwrap(); wr.write(b",\"port\":").unwrap();
(write!(wr, "{}", log.origin.port)).unwrap(); (write!(wr, "{}", log.origin.port)).unwrap();
wr.write_str(",\"hostname\":").unwrap(); wr.write(b",\"hostname\":").unwrap();
(write!(wr, "\"{}\"", log.origin.hostname)).unwrap(); (write!(wr, "\"{}\"", log.origin.hostname)).unwrap();
wr.write_str(",\"protocol\":").unwrap(); wr.write(b",\"protocol\":").unwrap();
(write!(wr, "{}", log.origin.protocol as usize)).unwrap(); (write!(wr, "{}", log.origin.protocol as usize)).unwrap();
wr.write_str("},\"country\":").unwrap(); wr.write(b"},\"country\":").unwrap();
(write!(wr, "{}", log.country as usize)).unwrap(); (write!(wr, "{}", log.country as usize)).unwrap();
wr.write_str(",\"cache_status\":").unwrap(); wr.write(b",\"cache_status\":").unwrap();
(write!(wr, "{}", log.cache_status as usize)).unwrap(); (write!(wr, "{}", log.cache_status as usize)).unwrap();
wr.write_str(",\"server_ip\":").unwrap(); wr.write(b",\"server_ip\":").unwrap();
(write!(wr, "\"{}\"", log.server_ip)).unwrap(); (write!(wr, "\"{}\"", log.server_ip)).unwrap();
wr.write_str(",\"server_name\":").unwrap(); wr.write(b",\"server_name\":").unwrap();
(write!(wr, "\"{}\"", log.server_name)).unwrap(); (write!(wr, "\"{}\"", log.server_name)).unwrap();
wr.write_str(",\"remote_ip\":").unwrap(); wr.write(b",\"remote_ip\":").unwrap();
(write!(wr, "\"{}\"", log.remote_ip)).unwrap(); (write!(wr, "\"{}\"", log.remote_ip)).unwrap();
wr.write_str(",\"bytes_dlv\":").unwrap(); wr.write(b",\"bytes_dlv\":").unwrap();
(write!(wr, "{}", log.bytes_dlv)).unwrap(); (write!(wr, "{}", log.bytes_dlv)).unwrap();
wr.write_str(",\"ray_id\":").unwrap(); wr.write(b",\"ray_id\":").unwrap();
(write!(wr, "\"{}\"", log.ray_id)).unwrap(); (write!(wr, "\"{}\"", log.ray_id)).unwrap();
wr.write_str("}").unwrap(); wr.write(b"}").unwrap();
} }
fn manual_serialize_escape<W: Writer>(wr: &mut W, log: &Log) { fn manual_serialize_escape<W: io::Write>(wr: &mut W, log: &Log) {
wr.write_str("{").unwrap(); wr.write_all(b"{").unwrap();
escape_str(wr, "timestamp").unwrap(); escape_str(wr, "timestamp").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
(write!(wr, "{}", log.timestamp)).unwrap(); (write!(wr, "{}", log.timestamp)).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "zone_id").unwrap(); escape_str(wr, "zone_id").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
(write!(wr, "{}", log.zone_id)).unwrap(); (write!(wr, "{}", log.zone_id)).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "zone_plan").unwrap(); escape_str(wr, "zone_plan").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
(write!(wr, "{}", log.zone_plan as isize)).unwrap(); (write!(wr, "{}", log.zone_plan as isize)).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "http").unwrap(); escape_str(wr, "http").unwrap();
wr.write_str(":{").unwrap(); wr.write_all(b":{").unwrap();
escape_str(wr, "protocol").unwrap(); escape_str(wr, "protocol").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
(write!(wr, "{}", log.http.protocol as usize)).unwrap(); (write!(wr, "{}", log.http.protocol as usize)).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "status").unwrap(); escape_str(wr, "status").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
(write!(wr, "{}", log.http.status)).unwrap(); (write!(wr, "{}", log.http.status)).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "host_status").unwrap(); escape_str(wr, "host_status").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
(write!(wr, "{}", log.http.host_status)).unwrap(); (write!(wr, "{}", log.http.host_status)).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "up_status").unwrap(); escape_str(wr, "up_status").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
(write!(wr, "{}", log.http.up_status)).unwrap(); (write!(wr, "{}", log.http.up_status)).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "method").unwrap(); escape_str(wr, "method").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
(write!(wr, "{}", log.http.method as usize)).unwrap(); (write!(wr, "{}", log.http.method as usize)).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "content_type").unwrap(); escape_str(wr, "content_type").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
escape_str(wr, &log.http.content_type).unwrap(); escape_str(wr, &log.http.content_type).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "user_agent").unwrap(); escape_str(wr, "user_agent").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
escape_str(wr, &log.http.user_agent).unwrap(); escape_str(wr, &log.http.user_agent).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "referer").unwrap(); escape_str(wr, "referer").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
escape_str(wr, &log.http.referer).unwrap(); escape_str(wr, &log.http.referer).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "request_uri").unwrap(); escape_str(wr, "request_uri").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
escape_str(wr, &log.http.request_uri).unwrap(); escape_str(wr, &log.http.request_uri).unwrap();
wr.write_str("},").unwrap(); wr.write_all(b"},").unwrap();
escape_str(wr, "origin").unwrap(); escape_str(wr, "origin").unwrap();
wr.write_str(":{").unwrap(); wr.write_all(b":{").unwrap();
escape_str(wr, "ip").unwrap(); escape_str(wr, "ip").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
escape_str(wr, &log.origin.ip).unwrap(); escape_str(wr, &log.origin.ip).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "port").unwrap(); escape_str(wr, "port").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
(write!(wr, "{}", log.origin.port)).unwrap(); (write!(wr, "{}", log.origin.port)).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "hostname").unwrap(); escape_str(wr, "hostname").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
escape_str(wr, &log.origin.hostname).unwrap(); escape_str(wr, &log.origin.hostname).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "protocol").unwrap(); escape_str(wr, "protocol").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
(write!(wr, "{}", log.origin.protocol as usize)).unwrap(); (write!(wr, "{}", log.origin.protocol as usize)).unwrap();
wr.write_str("},").unwrap(); wr.write_all(b"},").unwrap();
escape_str(wr, "country").unwrap(); escape_str(wr, "country").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
(write!(wr, "{}", log.country as usize)).unwrap(); (write!(wr, "{}", log.country as usize)).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "cache_status").unwrap(); escape_str(wr, "cache_status").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
(write!(wr, "{}", log.cache_status as usize)).unwrap(); (write!(wr, "{}", log.cache_status as usize)).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "server_ip").unwrap(); escape_str(wr, "server_ip").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
escape_str(wr, &log.server_ip).unwrap(); escape_str(wr, &log.server_ip).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "server_name").unwrap(); escape_str(wr, "server_name").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
escape_str(wr, &log.server_name).unwrap(); escape_str(wr, &log.server_name).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "remote_ip").unwrap(); escape_str(wr, "remote_ip").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
escape_str(wr, &log.remote_ip).unwrap(); escape_str(wr, &log.remote_ip).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "bytes_dlv").unwrap(); escape_str(wr, "bytes_dlv").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
(write!(wr, "{}", log.bytes_dlv)).unwrap(); (write!(wr, "{}", log.bytes_dlv)).unwrap();
wr.write_str(",").unwrap(); wr.write_all(b",").unwrap();
escape_str(wr, "ray_id").unwrap(); escape_str(wr, "ray_id").unwrap();
wr.write_str(":").unwrap(); wr.write_all(b":").unwrap();
escape_str(wr, &log.ray_id).unwrap(); escape_str(wr, &log.ray_id).unwrap();
wr.write_str("}").unwrap(); wr.write_all(b"}").unwrap();
} }
#[test] #[test]
serde2/src/json/ser.rs
+129 -92
View File
@@ -1,17 +1,16 @@
use std::f64; use std::{f32, f64};
use std::old_io::{self, ByRefWriter, IoError}; use std::io;
use std::num::{Float, FpCategory}; use std::num::{Float, FpCategory};
use std::string::FromUtf8Error; use std::string::FromUtf8Error;
use ser; use ser::{self, Serializer};
use ser::Serializer;
/// A structure for implementing serialization to JSON. /// A structure for implementing serialization to JSON.
pub struct Writer<W> { pub struct Writer<W> {
writer: W, writer: W,
} }
impl<W: old_io::Writer> Writer<W> { impl<W: io::Write> Writer<W> {
/// Creates a new JSON visitr whose output will be written to the writer /// Creates a new JSON visitr whose output will be written to the writer
/// specified. /// specified.
#[inline] #[inline]
@@ -28,14 +27,14 @@ impl<W: old_io::Writer> Writer<W> {
} }
} }
impl<W: old_io::Writer> ser::Serializer for Writer<W> { impl<W: io::Write> ser::Serializer for Writer<W> {
type Value = (); type Value = ();
type Error = IoError; type Error = io::Error;
#[inline] #[inline]
fn visit< fn visit<
T: ser::Serialize, T: ser::Serialize,
>(&mut self, value: &T) -> Result<(), IoError> { >(&mut self, value: &T) -> io::Result<()> {
value.visit(&mut Visitor { writer: &mut self.writer }) value.visit(&mut Visitor { writer: &mut self.writer })
} }
} }
@@ -44,225 +43,263 @@ struct Visitor<'a, W: 'a> {
writer: &'a mut W, writer: &'a mut W,
} }
impl<'a, W: old_io::Writer> ser::Visitor for Visitor<'a, W> { impl<'a, W: io::Write> ser::Visitor for Visitor<'a, W> {
type Value = (); type Value = ();
type Error = IoError; type Error = io::Error;
#[inline] #[inline]
fn visit_unit(&mut self) -> Result<(), IoError> { fn visit_unit(&mut self) -> io::Result<()> {
self.writer.write_str("null") try!(self.writer.write(b"null"));
Ok(())
} }
#[inline] #[inline]
fn visit_bool(&mut self, value: bool) -> Result<(), IoError> { fn visit_bool(&mut self, value: bool) -> io::Result<()> {
if value { if value {
self.writer.write_str("true") try!(self.writer.write(b"true"));
} else { } else {
self.writer.write_str("false") try!(self.writer.write(b"false"));
} }
Ok(())
} }
#[inline] #[inline]
fn visit_isize(&mut self, value: isize) -> Result<(), IoError> { fn visit_isize(&mut self, value: isize) -> io::Result<()> {
write!(self.writer, "{}", value) write!(self.writer, "{}", value)
} }
#[inline] #[inline]
fn visit_i8(&mut self, value: i8) -> Result<(), IoError> { fn visit_i8(&mut self, value: i8) -> io::Result<()> {
write!(self.writer, "{}", value) write!(self.writer, "{}", value)
} }
#[inline] #[inline]
fn visit_i16(&mut self, value: i16) -> Result<(), IoError> { fn visit_i16(&mut self, value: i16) -> io::Result<()> {
write!(self.writer, "{}", value) write!(self.writer, "{}", value)
} }
#[inline] #[inline]
fn visit_i32(&mut self, value: i32) -> Result<(), IoError> { fn visit_i32(&mut self, value: i32) -> io::Result<()> {
write!(self.writer, "{}", value) write!(self.writer, "{}", value)
} }
#[inline] #[inline]
fn visit_i64(&mut self, value: i64) -> Result<(), IoError> { fn visit_i64(&mut self, value: i64) -> io::Result<()> {
write!(self.writer, "{}", value) write!(self.writer, "{}", value)
} }
#[inline] #[inline]
fn visit_usize(&mut self, value: usize) -> Result<(), IoError> { fn visit_usize(&mut self, value: usize) -> io::Result<()> {
write!(self.writer, "{}", value) write!(self.writer, "{}", value)
} }
#[inline] #[inline]
fn visit_u8(&mut self, value: u8) -> Result<(), IoError> { fn visit_u8(&mut self, value: u8) -> io::Result<()> {
write!(self.writer, "{}", value) write!(self.writer, "{}", value)
} }
#[inline] #[inline]
fn visit_u16(&mut self, value: u16) -> Result<(), IoError> { fn visit_u16(&mut self, value: u16) -> io::Result<()> {
write!(self.writer, "{}", value) write!(self.writer, "{}", value)
} }
#[inline] #[inline]
fn visit_u32(&mut self, value: u32) -> Result<(), IoError> { fn visit_u32(&mut self, value: u32) -> io::Result<()> {
write!(self.writer, "{}", value) write!(self.writer, "{}", value)
} }
#[inline] #[inline]
fn visit_u64(&mut self, value: u64) -> Result<(), IoError> { fn visit_u64(&mut self, value: u64) -> io::Result<()> {
write!(self.writer, "{}", value) write!(self.writer, "{}", value)
} }
#[inline] #[inline]
fn visit_f64(&mut self, value: f64) -> Result<(), IoError> { fn visit_f32(&mut self, value: f32) -> io::Result<()> {
fmt_f32_or_null(self.writer, value)
}
#[inline]
fn visit_f64(&mut self, value: f64) -> io::Result<()> {
fmt_f64_or_null(self.writer, value) fmt_f64_or_null(self.writer, value)
} }
#[inline] #[inline]
fn visit_char(&mut self, v: char) -> Result<(), IoError> { fn visit_char(&mut self, value: char) -> io::Result<()> {
escape_char(self.writer, v) escape_char(self.writer, value)
} }
#[inline] #[inline]
fn visit_str(&mut self, value: &str) -> Result<(), IoError> { fn visit_str(&mut self, value: &str) -> io::Result<()> {
escape_str(self.writer, value) escape_str(self.writer, value)
} }
#[inline] #[inline]
fn visit_none(&mut self) -> Result<(), IoError> { fn visit_none(&mut self) -> io::Result<()> {
self.visit_unit() self.visit_unit()
} }
#[inline] #[inline]
fn visit_some<V>(&mut self, value: V) -> Result<(), IoError> fn visit_some<V>(&mut self, value: V) -> io::Result<()>
where V: ser::Serialize where V: ser::Serialize
{ {
value.visit(self) value.visit(self)
} }
#[inline] #[inline]
fn visit_seq<V>(&mut self, mut visitor: V) -> Result<(), IoError> fn visit_seq<V>(&mut self, mut visitor: V) -> io::Result<()>
where V: ser::SeqVisitor, where V: ser::SeqVisitor,
{ {
try!(self.writer.write_str("[")); try!(self.writer.write(b"["));
while let Some(()) = try!(visitor.visit(self)) { } while let Some(()) = try!(visitor.visit(self)) { }
self.writer.write_str("]") try!(self.writer.write(b"]"));
Ok(())
} }
#[inline] #[inline]
fn visit_seq_elt<T>(&mut self, first: bool, value: T) -> Result<(), IoError> fn visit_seq_elt<T>(&mut self, first: bool, value: T) -> io::Result<()>
where T: ser::Serialize, where T: ser::Serialize,
{ {
if !first { if !first {
try!(self.writer.write_str(",")); try!(self.writer.write(b","));
} }
value.visit(self) value.visit(self)
} }
#[inline] #[inline]
fn visit_map<V>(&mut self, mut visitor: V) -> Result<(), IoError> fn visit_map<V>(&mut self, mut visitor: V) -> io::Result<()>
where V: ser::MapVisitor, where V: ser::MapVisitor,
{ {
try!(self.writer.write_str("{")); try!(self.writer.write(b"{"));
while let Some(()) = try!(visitor.visit(self)) { } while let Some(()) = try!(visitor.visit(self)) { }
self.writer.write_str("}") try!(self.writer.write(b"}"));
Ok(())
} }
#[inline] #[inline]
fn visit_map_elt<K, V>(&mut self, first: bool, key: K, value: V) -> Result<(), IoError> fn visit_map_elt<K, V>(&mut self, first: bool, key: K, value: V) -> io::Result<()>
where K: ser::Serialize, where K: ser::Serialize,
V: ser::Serialize, V: ser::Serialize,
{ {
if !first { if !first {
try!(self.writer.write_str(",")); try!(self.writer.write(b","));
} }
try!(key.visit(self)); try!(key.visit(self));
try!(self.writer.write_str(":")); try!(self.writer.write(b":"));
value.visit(self) try!(value.visit(self));
Ok(())
} }
} }
#[inline] #[inline]
pub fn escape_bytes<W: old_io::Writer>(wr: &mut W, bytes: &[u8]) -> Result<(), IoError> { pub fn escape_bytes<W>(wr: &mut W, bytes: &[u8]) -> io::Result<()>
try!(wr.write_str("\"")); where W: io::Write
{
try!(wr.write(b"\""));
let mut start = 0; let mut start = 0;
for (i, byte) in bytes.iter().enumerate() { for (i, byte) in bytes.iter().enumerate() {
let escaped = match *byte { let escaped = match *byte {
b'"' => "\\\"", b'"' => b"\\\"",
b'\\' => "\\\\", b'\\' => b"\\\\",
b'\x08' => "\\b", b'\x08' => b"\\b",
b'\x0c' => "\\f", b'\x0c' => b"\\f",
b'\n' => "\\n", b'\n' => b"\\n",
b'\r' => "\\r", b'\r' => b"\\r",
b'\t' => "\\t", b'\t' => b"\\t",
_ => { continue; } _ => { continue; }
}; };
if start < i { if start < i {
try!(wr.write_all(&bytes[start..i])); try!(wr.write(&bytes[start..i]));
} }
try!(wr.write_str(escaped)); try!(wr.write(escaped));
start = i + 1; start = i + 1;
} }
if start != bytes.len() { if start != bytes.len() {
try!(wr.write_all(&bytes[start..])); try!(wr.write(&bytes[start..]));
} }
wr.write_str("\"") try!(wr.write(b"\""));
}
#[inline]
pub fn escape_str<W: old_io::Writer>(wr: &mut W, value: &str) -> Result<(), IoError> {
escape_bytes(wr, value.as_bytes())
}
#[inline]
pub fn escape_char<W: old_io::Writer>(wr: &mut W, value: char) -> Result<(), IoError> {
let mut buf = &mut [0; 4];
value.encode_utf8(buf);
escape_bytes(wr, buf)
}
fn fmt_f64_or_null<W: old_io::Writer>(wr: &mut W, value: f64) -> Result<(), IoError> {
match value.classify() {
FpCategory::Nan | FpCategory::Infinite => wr.write_str("null"),
_ => wr.write_str(&f64::to_str_digits(value, 6)),
}
}
#[inline]
pub fn to_writer<W, T>(wr: &mut W, value: &T) -> Result<(), IoError>
where W: old_io::Writer,
T: ser::Serialize,
{
let mut wr = Writer::new(wr.by_ref());
try!(wr.visit(value));
Ok(()) Ok(())
} }
#[inline] #[inline]
pub fn to_vec<T>(value: &T) -> Result<Vec<u8>, IoError> pub fn escape_str<W>(wr: &mut W, value: &str) -> io::Result<()>
where T: ser::Serialize, where W: io::Write
{ {
let mut wr = Vec::with_capacity(128); escape_bytes(wr, value.as_bytes())
to_writer(&mut wr, value).unwrap();
Ok(wr)
} }
#[inline] #[inline]
pub fn to_string<T>(value: &T) -> Result<Result<String, FromUtf8Error>, IoError> fn escape_char<W>(wr: &mut W, value: char) -> io::Result<()>
where W: io::Write
{
let buf = &mut [0; 4];
value.encode_utf8(buf);
escape_bytes(wr, buf)
}
fn fmt_f32_or_null<W>(wr: &mut W, value: f32) -> io::Result<()>
where W: io::Write
{
match value.classify() {
FpCategory::Nan | FpCategory::Infinite => try!(wr.write(b"null")),
_ => try!(wr.write(f32::to_str_digits(value, 6).as_bytes())),
};
Ok(())
}
fn fmt_f64_or_null<W>(wr: &mut W, value: f64) -> io::Result<()>
where W: io::Write
{
match value.classify() {
FpCategory::Nan | FpCategory::Infinite => try!(wr.write(b"null")),
_ => try!(wr.write(f64::to_str_digits(value, 6).as_bytes())),
};
Ok(())
}
/// Encode the specified struct into a json `[u8]` writer.
#[inline]
pub fn to_writer<W, T>(writer: &mut W, value: &T) -> io::Result<()>
where W: io::Write,
T: ser::Serialize,
{
let mut writer = Writer::new(writer);
try!(writer.visit(value));
Ok(())
}
/// Encode the specified struct into a json `[u8]` buffer.
#[inline]
pub fn to_vec<T>(value: &T) -> Vec<u8>
where T: ser::Serialize, where T: ser::Serialize,
{ {
let vec = try!(to_vec(value)); // We are writing to a Vec, which doesn't fail. So we can ignore
Ok(String::from_utf8(vec)) // the error.
let mut writer = Vec::with_capacity(128);
to_writer(&mut writer, value).unwrap();
writer
}
/// Encode the specified struct into a json `String` buffer.
#[inline]
pub fn to_string<T>(value: &T) -> Result<String, FromUtf8Error>
where T: ser::Serialize
{
let vec = to_vec(value);
String::from_utf8(vec)
} }
serde2/src/json/value.rs
+11 -4
View File
@@ -1,6 +1,6 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::fmt; use std::fmt;
use std::old_io; use std::io;
use std::str; use std::str;
use ser::{self, Serializer}; use ser::{self, Serializer};
@@ -51,9 +51,16 @@ struct WriterFormatter<'a, 'b: 'a> {
inner: &'a mut fmt::Formatter<'b>, inner: &'a mut fmt::Formatter<'b>,
} }
impl<'a, 'b> old_io::Writer for WriterFormatter<'a, 'b> { impl<'a, 'b> io::Write for WriterFormatter<'a, 'b> {
fn write_all(&mut self, buf: &[u8]) -> old_io::IoResult<()> { fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
self.inner.write_str(str::from_utf8(buf).unwrap()).map_err(|_| old_io::IoError::last_error()) match self.inner.write_str(str::from_utf8(buf).unwrap()) {
Ok(_) => Ok(buf.len()),
Err(_) => Err(io::Error::last_os_error()),
}
}
fn flush(&mut self) -> io::Result<()> {
Ok(())
} }
} }
serde2/src/lib.rs
+1 -1
View File
@@ -1,4 +1,4 @@
#![feature(core, io, std_misc, unicode)] #![feature(core, hash, io, std_misc, unicode)]
extern crate unicode; extern crate unicode;
serde2/src/ser.rs
+2 -3
View File
@@ -19,9 +19,8 @@ pub trait Serializer {
type Value; type Value;
type Error; type Error;
fn visit< fn visit<T>(&mut self, value: &T) -> Result<Self::Value, Self::Error>
T: Serialize, where T: Serialize;
>(&mut self, value: &T) -> Result<Self::Value, Self::Error>;
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
src/json/ser.rs
+172 -171
View File
@@ -4,92 +4,8 @@ use std::num::{Float, FpCategory};
use std::io; use std::io;
use std::string::FromUtf8Error; use std::string::FromUtf8Error;
use ser::Serialize;
use ser; use ser;
fn escape_bytes<W: io::Write>(wr: &mut W, bytes: &[u8]) -> io::Result<()> {
try!(wr.write(b"\""));
let mut start = 0;
for (i, byte) in bytes.iter().enumerate() {
let escaped = match *byte {
b'"' => b"\\\"",
b'\\' => b"\\\\",
b'\x08' => b"\\b",
b'\x0c' => b"\\f",
b'\n' => b"\\n",
b'\r' => b"\\r",
b'\t' => b"\\t",
_ => { continue; }
};
if start < i {
try!(wr.write(&bytes[start..i]));
}
try!(wr.write(escaped));
start = i + 1;
}
if start != bytes.len() {
try!(wr.write_all(&bytes[start..]));
}
wr.write_all(b"\"")
}
pub fn escape_str<W: io::Write>(wr: &mut W, v: &str) -> io::Result<()> {
escape_bytes(wr, v.as_bytes())
}
fn escape_char<W: io::Write>(wr: &mut W, v: char) -> io::Result<()> {
let buf = &mut [0; 4];
v.encode_utf8(buf);
escape_bytes(wr, buf)
}
fn fmt_f32_or_null<W: io::Write>(wr: &mut W, v: f32) -> io::Result<()> {
match v.classify() {
FpCategory::Nan | FpCategory::Infinite => write!(wr, "null"),
_ => write!(wr, "{}", f32::to_str_digits(v, 6)),
}
}
fn fmt_f64_or_null<W: io::Write>(wr: &mut W, v: f64) -> io::Result<()> {
match v.classify() {
FpCategory::Nan | FpCategory::Infinite => write!(wr, "null"),
_ => write!(wr, "{}", f64::to_str_digits(v, 6)),
}
}
fn spaces<W: io::Write>(wr: &mut W, mut n: usize) -> io::Result<()> {
const LEN: usize = 16;
const BUF: &'static [u8; LEN] = &[b' '; LEN];
while n >= LEN {
try!(wr.write_all(BUF));
n -= LEN;
}
if n > 0 {
wr.write_all(&BUF[..n])
} else {
Ok(())
}
}
/*
#[derive(Debug)]
enum SerializerState {
ValueState,
TupleState,
StructState,
EnumState,
}
*/
/// A structure for implementing serialization to JSON. /// A structure for implementing serialization to JSON.
pub struct Serializer<W> { pub struct Serializer<W> {
wr: W, wr: W,
@@ -119,8 +35,8 @@ impl<W: io::Write> ser::Serializer<io::Error> for Serializer<W> {
} }
#[inline] #[inline]
fn serialize_bool(&mut self, v: bool) -> io::Result<()> { fn serialize_bool(&mut self, value: bool) -> io::Result<()> {
if v { if value {
self.wr.write_all(b"true") self.wr.write_all(b"true")
} else { } else {
self.wr.write_all(b"false") self.wr.write_all(b"false")
@@ -128,73 +44,73 @@ impl<W: io::Write> ser::Serializer<io::Error> for Serializer<W> {
} }
#[inline] #[inline]
fn serialize_isize(&mut self, v: isize) -> io::Result<()> { fn serialize_isize(&mut self, value: isize) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_i8(&mut self, v: i8) -> io::Result<()> { fn serialize_i8(&mut self, value: i8) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_i16(&mut self, v: i16) -> io::Result<()> { fn serialize_i16(&mut self, value: i16) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_i32(&mut self, v: i32) -> io::Result<()> { fn serialize_i32(&mut self, value: i32) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_i64(&mut self, v: i64) -> io::Result<()> { fn serialize_i64(&mut self, value: i64) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_usize(&mut self, v: usize) -> io::Result<()> { fn serialize_usize(&mut self, value: usize) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_u8(&mut self, v: u8) -> io::Result<()> { fn serialize_u8(&mut self, value: u8) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_u16(&mut self, v: u16) -> io::Result<()> { fn serialize_u16(&mut self, value: u16) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_u32(&mut self, v: u32) -> io::Result<()> { fn serialize_u32(&mut self, value: u32) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_u64(&mut self, v: u64) -> io::Result<()> { fn serialize_u64(&mut self, value: u64) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_f32(&mut self, v: f32) -> io::Result<()> { fn serialize_f32(&mut self, value: f32) -> io::Result<()> {
fmt_f32_or_null(&mut self.wr, v) fmt_f32_or_null(&mut self.wr, value)
} }
#[inline] #[inline]
fn serialize_f64(&mut self, v: f64) -> io::Result<()> { fn serialize_f64(&mut self, value: f64) -> io::Result<()> {
fmt_f64_or_null(&mut self.wr, v) fmt_f64_or_null(&mut self.wr, value)
} }
#[inline] #[inline]
fn serialize_char(&mut self, v: char) -> io::Result<()> { fn serialize_char(&mut self, value: char) -> io::Result<()> {
escape_char(&mut self.wr, v) escape_char(&mut self.wr, value)
} }
#[inline] #[inline]
fn serialize_str(&mut self, v: &str) -> io::Result<()> { fn serialize_str(&mut self, value: &str) -> io::Result<()> {
escape_str(&mut self.wr, v) escape_str(&mut self.wr, value)
} }
#[inline] #[inline]
@@ -205,7 +121,7 @@ impl<W: io::Write> ser::Serializer<io::Error> for Serializer<W> {
#[inline] #[inline]
fn serialize_tuple_elt< fn serialize_tuple_elt<
T: Serialize<Serializer<W>, io::Error> T: ser::Serialize<Serializer<W>, io::Error>
>(&mut self, value: &T) -> io::Result<()> { >(&mut self, value: &T) -> io::Result<()> {
if self.first { if self.first {
self.first = false; self.first = false;
@@ -228,8 +144,10 @@ impl<W: io::Write> ser::Serializer<io::Error> for Serializer<W> {
#[inline] #[inline]
fn serialize_struct_elt< fn serialize_struct_elt<
T: Serialize<Serializer<W>, io::Error> T: ser::Serialize<Serializer<W>, io::Error>
>(&mut self, name: &str, value: &T) -> io::Result<()> { >(&mut self, name: &str, value: &T) -> io::Result<()> {
use ser::Serialize;
if self.first { if self.first {
self.first = false; self.first = false;
} else { } else {
@@ -255,7 +173,7 @@ impl<W: io::Write> ser::Serializer<io::Error> for Serializer<W> {
#[inline] #[inline]
fn serialize_enum_elt< fn serialize_enum_elt<
T: Serialize<Serializer<W>, io::Error> T: ser::Serialize<Serializer<W>, io::Error>
>(&mut self, value: &T) -> io::Result<()> { >(&mut self, value: &T) -> io::Result<()> {
if self.first { if self.first {
self.first = false; self.first = false;
@@ -272,7 +190,7 @@ impl<W: io::Write> ser::Serializer<io::Error> for Serializer<W> {
#[inline] #[inline]
fn serialize_option< fn serialize_option<
T: Serialize<Serializer<W>, io::Error> T: ser::Serialize<Serializer<W>, io::Error>
>(&mut self, v: &Option<T>) -> io::Result<()> { >(&mut self, v: &Option<T>) -> io::Result<()> {
match *v { match *v {
Some(ref v) => { Some(ref v) => {
@@ -286,7 +204,7 @@ impl<W: io::Write> ser::Serializer<io::Error> for Serializer<W> {
#[inline] #[inline]
fn serialize_seq< fn serialize_seq<
T: Serialize<Serializer<W>, io::Error>, T: ser::Serialize<Serializer<W>, io::Error>,
Iter: Iterator<Item=T> Iter: Iterator<Item=T>
>(&mut self, iter: Iter) -> io::Result<()> { >(&mut self, iter: Iter) -> io::Result<()> {
try!(write!(&mut self.wr, "[")); try!(write!(&mut self.wr, "["));
@@ -305,8 +223,8 @@ impl<W: io::Write> ser::Serializer<io::Error> for Serializer<W> {
#[inline] #[inline]
fn serialize_map< fn serialize_map<
K: Serialize<Serializer<W>, io::Error>, K: ser::Serialize<Serializer<W>, io::Error>,
V: Serialize<Serializer<W>, io::Error>, V: ser::Serialize<Serializer<W>, io::Error>,
Iter: Iterator<Item=(K, V)> Iter: Iterator<Item=(K, V)>
>(&mut self, iter: Iter) -> io::Result<()> { >(&mut self, iter: Iter) -> io::Result<()> {
try!(write!(&mut self.wr, "{{")); try!(write!(&mut self.wr, "{{"));
@@ -391,73 +309,73 @@ impl<W: io::Write> ser::Serializer<io::Error> for PrettySerializer<W> {
} }
#[inline] #[inline]
fn serialize_isize(&mut self, v: isize) -> io::Result<()> { fn serialize_isize(&mut self, value: isize) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_i8(&mut self, v: i8) -> io::Result<()> { fn serialize_i8(&mut self, value: i8) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_i16(&mut self, v: i16) -> io::Result<()> { fn serialize_i16(&mut self, value: i16) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_i32(&mut self, v: i32) -> io::Result<()> { fn serialize_i32(&mut self, value: i32) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_i64(&mut self, v: i64) -> io::Result<()> { fn serialize_i64(&mut self, value: i64) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_usize(&mut self, v: usize) -> io::Result<()> { fn serialize_usize(&mut self, value: usize) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_u8(&mut self, v: u8) -> io::Result<()> { fn serialize_u8(&mut self, value: u8) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_u16(&mut self, v: u16) -> io::Result<()> { fn serialize_u16(&mut self, value: u16) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_u32(&mut self, v: u32) -> io::Result<()> { fn serialize_u32(&mut self, value: u32) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_u64(&mut self, v: u64) -> io::Result<()> { fn serialize_u64(&mut self, value: u64) -> io::Result<()> {
write!(&mut self.wr, "{}", v) write!(&mut self.wr, "{}", value)
} }
#[inline] #[inline]
fn serialize_f32(&mut self, v: f32) -> io::Result<()> { fn serialize_f32(&mut self, value: f32) -> io::Result<()> {
fmt_f32_or_null(&mut self.wr, v) fmt_f32_or_null(&mut self.wr, value)
} }
#[inline] #[inline]
fn serialize_f64(&mut self, v: f64) -> io::Result<()> { fn serialize_f64(&mut self, value: f64) -> io::Result<()> {
fmt_f64_or_null(&mut self.wr, v) fmt_f64_or_null(&mut self.wr, value)
} }
#[inline] #[inline]
fn serialize_char(&mut self, v: char) -> io::Result<()> { fn serialize_char(&mut self, value: char) -> io::Result<()> {
escape_char(&mut self.wr, v) escape_char(&mut self.wr, value)
} }
#[inline] #[inline]
fn serialize_str(&mut self, v: &str) -> io::Result<()> { fn serialize_str(&mut self, value: &str) -> io::Result<()> {
escape_str(&mut self.wr, v) escape_str(&mut self.wr, value)
} }
#[inline] #[inline]
@@ -468,7 +386,7 @@ impl<W: io::Write> ser::Serializer<io::Error> for PrettySerializer<W> {
#[inline] #[inline]
fn serialize_tuple_elt< fn serialize_tuple_elt<
T: Serialize<PrettySerializer<W>, io::Error> T: ser::Serialize<PrettySerializer<W>, io::Error>
>(&mut self, value: &T) -> io::Result<()> { >(&mut self, value: &T) -> io::Result<()> {
try!(self.serialize_sep()); try!(self.serialize_sep());
value.serialize(self) value.serialize(self)
@@ -487,7 +405,7 @@ impl<W: io::Write> ser::Serializer<io::Error> for PrettySerializer<W> {
#[inline] #[inline]
fn serialize_struct_elt< fn serialize_struct_elt<
T: Serialize<PrettySerializer<W>, io::Error> T: ser::Serialize<PrettySerializer<W>, io::Error>
>(&mut self, name: &str, value: &T) -> io::Result<()> { >(&mut self, name: &str, value: &T) -> io::Result<()> {
try!(self.serialize_sep()); try!(self.serialize_sep());
try!(self.serialize_str(name)); try!(self.serialize_str(name));
@@ -512,7 +430,7 @@ impl<W: io::Write> ser::Serializer<io::Error> for PrettySerializer<W> {
#[inline] #[inline]
fn serialize_enum_elt< fn serialize_enum_elt<
T: Serialize<PrettySerializer<W>, io::Error> T: ser::Serialize<PrettySerializer<W>, io::Error>
>(&mut self, value: &T) -> io::Result<()> { >(&mut self, value: &T) -> io::Result<()> {
try!(self.serialize_sep()); try!(self.serialize_sep());
value.serialize(self) value.serialize(self)
@@ -526,7 +444,7 @@ impl<W: io::Write> ser::Serializer<io::Error> for PrettySerializer<W> {
#[inline] #[inline]
fn serialize_option< fn serialize_option<
T: Serialize<PrettySerializer<W>, io::Error> T: ser::Serialize<PrettySerializer<W>, io::Error>
>(&mut self, v: &Option<T>) -> io::Result<()> { >(&mut self, v: &Option<T>) -> io::Result<()> {
match *v { match *v {
Some(ref v) => { Some(ref v) => {
@@ -540,7 +458,7 @@ impl<W: io::Write> ser::Serializer<io::Error> for PrettySerializer<W> {
#[inline] #[inline]
fn serialize_seq< fn serialize_seq<
T: Serialize<PrettySerializer<W>, io::Error>, T: ser::Serialize<PrettySerializer<W>, io::Error>,
Iter: Iterator<Item=T> Iter: Iterator<Item=T>
>(&mut self, iter: Iter) -> io::Result<()> { >(&mut self, iter: Iter) -> io::Result<()> {
try!(self.wr.write_all(b"[")); try!(self.wr.write_all(b"["));
@@ -556,8 +474,8 @@ impl<W: io::Write> ser::Serializer<io::Error> for PrettySerializer<W> {
#[inline] #[inline]
fn serialize_map< fn serialize_map<
K: Serialize<PrettySerializer<W>, io::Error>, K: ser::Serialize<PrettySerializer<W>, io::Error>,
V: Serialize<PrettySerializer<W>, io::Error>, V: ser::Serialize<PrettySerializer<W>, io::Error>,
Iter: Iterator<Item=(K, V)> Iter: Iterator<Item=(K, V)>
>(&mut self, iter: Iter) -> io::Result<()> { >(&mut self, iter: Iter) -> io::Result<()> {
try!(self.wr.write_all(b"{")); try!(self.wr.write_all(b"{"));
@@ -574,12 +492,95 @@ impl<W: io::Write> ser::Serializer<io::Error> for PrettySerializer<W> {
} }
} }
fn escape_bytes<W>(wr: &mut W, bytes: &[u8]) -> io::Result<()>
where W: io::Write
{
try!(wr.write_all(b"\""));
let mut start = 0;
for (i, byte) in bytes.iter().enumerate() {
let escaped = match *byte {
b'"' => b"\\\"",
b'\\' => b"\\\\",
b'\x08' => b"\\b",
b'\x0c' => b"\\f",
b'\n' => b"\\n",
b'\r' => b"\\r",
b'\t' => b"\\t",
_ => { continue; }
};
if start < i {
try!(wr.write_all(&bytes[start..i]));
}
try!(wr.write_all(escaped));
start = i + 1;
}
if start != bytes.len() {
try!(wr.write_all(&bytes[start..]));
}
wr.write_all(b"\"")
}
pub fn escape_str<W>(wr: &mut W, value: &str) -> io::Result<()>
where W: io::Write
{
escape_bytes(wr, value.as_bytes())
}
fn escape_char<W>(wr: &mut W, value: char) -> io::Result<()>
where W: io::Write
{
let buf = &mut [0; 4];
value.encode_utf8(buf);
escape_bytes(wr, buf)
}
fn fmt_f32_or_null<W>(wr: &mut W, value: f32) -> io::Result<()>
where W: io::Write
{
match value.classify() {
FpCategory::Nan | FpCategory::Infinite => wr.write_all(b"null"),
_ => wr.write_all(f32::to_str_digits(value, 6).as_bytes()),
}
}
fn fmt_f64_or_null<W>(wr: &mut W, value: f64) -> io::Result<()>
where W: io::Write
{
match value.classify() {
FpCategory::Nan | FpCategory::Infinite => wr.write_all(b"null"),
_ => wr.write_all(f64::to_str_digits(value, 6).as_bytes()),
}
}
fn spaces<W: io::Write>(wr: &mut W, mut n: usize) -> io::Result<()> {
const LEN: usize = 16;
const BUF: &'static [u8; LEN] = &[b' '; LEN];
while n >= LEN {
try!(wr.write_all(BUF));
n -= LEN;
}
if n > 0 {
wr.write_all(&BUF[..n])
} else {
Ok(())
}
}
/// Encode the specified struct into a json `[u8]` writer. /// Encode the specified struct into a json `[u8]` writer.
#[inline] #[inline]
pub fn to_writer< pub fn to_writer<W, T>(writer: W, value: &T) -> io::Result<W>
W: io::Write, where W: io::Write,
T: Serialize<Serializer<W>, io::Error> T: ser::Serialize<Serializer<W>, io::Error>
>(writer: W, value: &T) -> io::Result<W> { {
let mut serializer = Serializer::new(writer); let mut serializer = Serializer::new(writer);
try!(value.serialize(&mut serializer)); try!(value.serialize(&mut serializer));
Ok(serializer.unwrap()) Ok(serializer.unwrap())
@@ -587,9 +588,9 @@ pub fn to_writer<
/// Encode the specified struct into a json `[u8]` buffer. /// Encode the specified struct into a json `[u8]` buffer.
#[inline] #[inline]
pub fn to_vec< pub fn to_vec<T>(value: &T) -> Vec<u8>
T: Serialize<Serializer<Vec<u8>>, io::Error> where T: ser::Serialize<Serializer<Vec<u8>>, io::Error>
>(value: &T) -> Vec<u8> { {
// We are writing to a Vec, which doesn't fail. So we can ignore // We are writing to a Vec, which doesn't fail. So we can ignore
// the error. // the error.
let writer = Vec::with_capacity(128); let writer = Vec::with_capacity(128);
@@ -598,18 +599,18 @@ pub fn to_vec<
/// Encode the specified struct into a json `String` buffer. /// Encode the specified struct into a json `String` buffer.
#[inline] #[inline]
pub fn to_string< pub fn to_string<T>(value: &T) -> Result<String, FromUtf8Error>
T: Serialize<Serializer<Vec<u8>>, io::Error> where T: ser::Serialize<Serializer<Vec<u8>>, io::Error>
>(value: &T) -> Result<String, FromUtf8Error> { {
let buf = to_vec(value); let vec = to_vec(value);
String::from_utf8(buf) String::from_utf8(vec)
} }
/// Encode the specified struct into a json `[u8]` writer. /// Encode the specified struct into a json `[u8]` writer.
#[inline] #[inline]
pub fn to_pretty_writer< pub fn to_pretty_writer<
W: io::Write, W: io::Write,
T: Serialize<PrettySerializer<W>, io::Error> T: ser::Serialize<PrettySerializer<W>, io::Error>
>(writer: W, value: &T) -> io::Result<W> { >(writer: W, value: &T) -> io::Result<W> {
let mut serializer = PrettySerializer::new(writer); let mut serializer = PrettySerializer::new(writer);
try!(value.serialize(&mut serializer)); try!(value.serialize(&mut serializer));
@@ -618,7 +619,7 @@ pub fn to_pretty_writer<
/// Encode the specified struct into a json `[u8]` buffer. /// Encode the specified struct into a json `[u8]` buffer.
pub fn to_pretty_vec< pub fn to_pretty_vec<
T: Serialize<PrettySerializer<Vec<u8>>, io::Error> T: ser::Serialize<PrettySerializer<Vec<u8>>, io::Error>
>(value: &T) -> Vec<u8> { >(value: &T) -> Vec<u8> {
// We are writing to a Vec, which doesn't fail. So we can ignore // We are writing to a Vec, which doesn't fail. So we can ignore
// the error. // the error.
@@ -628,7 +629,7 @@ pub fn to_pretty_vec<
/// Encode the specified struct into a json `String` buffer. /// Encode the specified struct into a json `String` buffer.
pub fn to_pretty_string< pub fn to_pretty_string<
T: Serialize<PrettySerializer<Vec<u8>>, io::Error> T: ser::Serialize<PrettySerializer<Vec<u8>>, io::Error>
>(value: &T) -> Result<String, FromUtf8Error> { >(value: &T) -> Result<String, FromUtf8Error> {
let buf = to_pretty_vec(value); let buf = to_pretty_vec(value);
String::from_utf8(buf) String::from_utf8(buf)