Skip to content

Commit 8179f3b

Browse files
committed
fix(cmn): get cmn compiling on nightly rust
Closes #131
1 parent 5612d00 commit 8179f3b

3 files changed

Lines changed: 14 additions & 5 deletions

File tree

Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@ name = "cmn"
1616
path = "src/rust/lib.rs"
1717

1818
[dependencies]
19+
clap = "*"
1920
hyper = "*"
2021
mime = "*"
2122
rustc-serialize = "*"
22-
yup-oauth2 = "*"
23+
yup-oauth2 = { version = "*", features = ["nightly"], default-features = false }
2324
serde = "*"
25+
serde_json = "*"
2426
serde_macros = "*"
27+
strsim = "*"
2528

2629
[dev-dependencies]
2730
yup-hyper-mock = "*"

src/rust/cli/cmn.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ impl TokenStorage for JsonTokenStorage {
433433

434434
fn get(&self, scope_hash: u64, _: &Vec<&str>) -> Result<Option<Token>, json::Error> {
435435
match fs::File::open(&self.path(scope_hash)) {
436-
Ok(mut f) => {
436+
Ok(f) => {
437437
match json::de::from_reader(f) {
438438
Ok(token) => Ok(Some(token)),
439439
Err(err) => Err(err),
@@ -578,7 +578,7 @@ impl fmt::Display for CLIError {
578578
=> writeln!(f, "Failed to parse argument '{}' with value '{}' as {} with error: {}.",
579579
arg_name, value, type_name, err_desc),
580580
CLIError::UnknownParameter(ref param_name, ref possible_values) => {
581-
let mut suffix =
581+
let suffix =
582582
match did_you_mean(param_name, &possible_values) {
583583
Some(v) => format!(" Did you mean '{}' ?", v),
584584
None => String::new(),
@@ -692,7 +692,7 @@ pub fn application_secret_from_directory(dir: &str,
692692
}
693693
return secret_io_error(err)
694694
},
695-
Ok(mut f) => {
695+
Ok(f) => {
696696
match json::de::from_reader::<_, ConsoleApplicationSecret>(f) {
697697
Err(json::Error::IoError(err)) =>
698698
return secret_io_error(err),

src/rust/lib.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,18 @@
22
#![allow(dead_code, deprecated, unused_features, unused_variables, unused_imports)]
33
//! library with code shared by all generated implementations
44
#![plugin(serde_macros)]
5+
6+
#[macro_use]
7+
extern crate clap;
8+
59
#[macro_use]
610
extern crate hyper;
711
extern crate mime;
812
extern crate rustc_serialize;
913
extern crate yup_oauth2 as oauth2;
1014
extern crate serde;
15+
extern crate serde_json;
16+
extern crate strsim;
1117

1218
// just pull it in the check if it compiles
1319
mod api;
@@ -194,4 +200,4 @@ mod test_cli {
194200
assert_eq!(c.num_fields(), 3);
195201
assert_eq!(c.to_string(), "one.beer.one");
196202
}
197-
}
203+
}

0 commit comments

Comments
 (0)