Update to rust head

This commit is contained in:
Erick Tryzelaar 2014-07-02 21:06:28 -07:00
parent 48c471c769
commit a3f5f46754
2 changed files with 4 additions and 4 deletions

View File

@ -453,11 +453,11 @@ impl Log {
#[bench]
fn bench_encoder(b: &mut Bencher) {
let log = Log::new();
let json = serialize::json::Encoder::str_encode(&log);
let json = serialize::json::encode(&log);
let _len = json.len();
b.iter(|| {
let _ = serialize::json::Encoder::str_encode(&log);
let _ = serialize::json::encode(&log);
});
}

View File

@ -3691,7 +3691,7 @@ mod bench {
let mut list = vec!();
for _ in range(0, count) {
list.push(json::Object(box treemap!(
list.push(json::Object(treemap!(
"a".to_string() => json::Boolean(true),
"b".to_string() => json::Null,
"c".to_string() => json::Number(3.1415),
@ -3703,7 +3703,7 @@ mod bench {
))
)));
}
list.push(json::Object(box TreeMap::new()));
list.push(json::Object(TreeMap::new()));
json::List(list)
}