New upstream version 1.20.0+dfsg1

[rustc.git] / src / vendor / handlebars / examples / render-cli.rs

diff --git a/src/vendor/handlebars/examples/render-cli.rs b/src/vendor/handlebars/examples/render-cli.rs
index 8c533c9ac431b0edd3d1f84009ec90f06d70b1e0..f4b08dfca2559aa6be2ffe028262ad44ee873d7c 100644 (file)
--- a/src/vendor/handlebars/examples/render-cli.rs
+++ b/src/vendor/handlebars/examples/render-cli.rs
@@ -1,15 +1,13 @@
-#![allow(unused_imports, dead_code)]
 extern crate env_logger;
-#[cfg(all(feature = "rustc_ser_type", not(feature = "serde_type")))]
-extern crate rustc_serialize;
+extern crate serde_json;
 extern crate handlebars;
 
 use std::io::{self, Write};
 use std::process;
 use std::env;
+use std::str::FromStr;
 
-#[cfg(all(feature = "rustc_ser_type", not(feature = "serde_type")))]
-use rustc_serialize::json::Json;
+use serde_json::value::Value as Json;
 
 use handlebars::Handlebars;
 
@@ -22,7 +20,6 @@ fn usage() -> ! {
     process::exit(1);
 }
 
-#[cfg(all(feature = "rustc_ser_type", not(feature = "serde_type")))]
 fn parse_json(text: &str) -> Json {
     match Json::from_str(text) {
         Ok(json) => json,
@@ -30,7 +27,6 @@ fn parse_json(text: &str) -> Json {
     }
 }
 
-#[cfg(all(feature = "rustc_ser_type", not(feature = "serde_type")))]
 fn main() {
     env_logger::init().unwrap();