From a9c6061c9a542a617020073d0a6b187849d0e348 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Sat, 29 Mar 2014 01:05:46 +0100 Subject: Register new snapshot --- src/libtest/lib.rs | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'src/libtest') diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs index 751dc58450f..bcfd9ae758b 100644 --- a/src/libtest/lib.rs +++ b/src/libtest/lib.rs @@ -1018,22 +1018,6 @@ impl ToJson for Metric { } } -// FIXME: remove decode_ after snapshot -#[cfg(stage0)] -fn decode_(json: Json) -> MetricMap { - let mut decoder = json::Decoder::new(json); - MetricMap(Decodable::decode(&mut decoder)) -} - -#[cfg(not(stage0))] -fn decode_(json: Json) -> MetricMap { - let mut decoder = json::Decoder::new(json); - MetricMap(match Decodable::decode(&mut decoder) { - Ok(t) => t, - Err(e) => fail!("failure decoding JSON: {}", e) - }) -} - impl MetricMap { @@ -1051,7 +1035,11 @@ impl MetricMap { assert!(p.exists()); let mut f = File::open(p).unwrap(); let value = json::from_reader(&mut f as &mut io::Reader).unwrap(); - decode_(value) + let mut decoder = json::Decoder::new(value); + MetricMap(match Decodable::decode(&mut decoder) { + Ok(t) => t, + Err(e) => fail!("failure decoding JSON: {}", e) + }) } /// Write MetricDiff to a file. -- cgit 1.4.1-3-g733a5