fix(cmn): get cmn compiling on nightly rust

Closes #131
This commit is contained in:
Erick Tryzelaar
2015-10-18 11:29:34 -07:00
parent 5612d004b9
commit 8179f3bf89
3 changed files with 14 additions and 5 deletions

View File

@@ -16,12 +16,15 @@ name = "cmn"
path = "src/rust/lib.rs"
[dependencies]
clap = "*"
hyper = "*"
mime = "*"
rustc-serialize = "*"
yup-oauth2 = "*"
yup-oauth2 = { version = "*", features = ["nightly"], default-features = false }
serde = "*"
serde_json = "*"
serde_macros = "*"
strsim = "*"
[dev-dependencies]
yup-hyper-mock = "*"

View File

@@ -433,7 +433,7 @@ impl TokenStorage for JsonTokenStorage {
fn get(&self, scope_hash: u64, _: &Vec<&str>) -> Result<Option<Token>, json::Error> {
match fs::File::open(&self.path(scope_hash)) {
Ok(mut f) => {
Ok(f) => {
match json::de::from_reader(f) {
Ok(token) => Ok(Some(token)),
Err(err) => Err(err),
@@ -578,7 +578,7 @@ impl fmt::Display for CLIError {
=> writeln!(f, "Failed to parse argument '{}' with value '{}' as {} with error: {}.",
arg_name, value, type_name, err_desc),
CLIError::UnknownParameter(ref param_name, ref possible_values) => {
let mut suffix =
let suffix =
match did_you_mean(param_name, &possible_values) {
Some(v) => format!(" Did you mean '{}' ?", v),
None => String::new(),
@@ -692,7 +692,7 @@ pub fn application_secret_from_directory(dir: &str,
}
return secret_io_error(err)
},
Ok(mut f) => {
Ok(f) => {
match json::de::from_reader::<_, ConsoleApplicationSecret>(f) {
Err(json::Error::IoError(err)) =>
return secret_io_error(err),

View File

@@ -2,12 +2,18 @@
#![allow(dead_code, deprecated, unused_features, unused_variables, unused_imports)]
//! library with code shared by all generated implementations
#![plugin(serde_macros)]
#[macro_use]
extern crate clap;
#[macro_use]
extern crate hyper;
extern crate mime;
extern crate rustc_serialize;
extern crate yup_oauth2 as oauth2;
extern crate serde;
extern crate serde_json;
extern crate strsim;
// just pull it in the check if it compiles
mod api;
@@ -194,4 +200,4 @@ mod test_cli {
assert_eq!(c.num_fields(), 3);
assert_eq!(c.to_string(), "one.beer.one");
}
}
}