grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #936 from ethcore/bumping-clippy

Browse Source 
Bumping clippy and fixing warnings.
This commit is contained in:
Arkadiy Paronyan
2016-04-12 16:49:30 +02:00
parent bdb35cfaed 7fbe3f4721
commit c7d6444ae0
14 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
parity/upgrade.rs
View File

@@ -22,6 +22,7 @@ use std::fs::File;
use std::env;
use std::io::{Read, Write};
#[cfg_attr(feature="dev", allow(enum_variant_names))]
#[derive(Debug)]
pub enum Error {
CannotLockVersionFile,
@@ -107,16 +108,12 @@ fn with_locked_version<F>(script: F) -> Result<usize, Error>
})
.unwrap_or_else(|| Version::parse("0.9.0").unwrap());
let script_result = {
let mut lock = try!(File::create(&path).map_err(|_| Error::CannotLockVersionFile));
let result = script(&version);
let mut lock = try!(File::create(&path).map_err(|_| Error::CannotLockVersionFile));
let result = script(&version);
let written_version = Version::parse(CURRENT_VERSION).unwrap();
try!(lock.write_all(written_version.to_string().as_bytes()).map_err(|_| Error::CannotUpdateVersionFile));
result
};
script_result
let written_version = Version::parse(CURRENT_VERSION).unwrap();
try!(lock.write_all(written_version.to_string().as_bytes()).map_err(|_| Error::CannotUpdateVersionFile));
result
}
pub fn upgrade() -> Result<usize, Error> {