chore(code): update with latest changes

This commit is contained in:
Sebastian Thiel
2015-12-24 15:46:51 +01:00
parent 8295bf3c2d
commit 06e1d4bff6
288 changed files with 1440 additions and 1440 deletions

View File

@@ -435,7 +435,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),
@@ -580,7 +580,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(),
@@ -694,7 +694,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),