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

Port try macro to new ? operator. (#3962)

Browse Source 
* initial untry sweep

* restore try in ipc codegen, fix inference

* change a few missed try instances
This commit is contained in:
Robert Habermeier
2016-12-27 12:53:56 +01:00
committed by Arkadiy Paronyan
parent b1ef52a6d7
commit 8125b5690c
165 changed files with 1696 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
util/bigint/src/hash.rs
View File

@@ -167,7 +167,7 @@ macro_rules! impl_hash {
type Err = FromHexError;
fn from_str(s: &str) -> Result<$from, FromHexError> {
let a = try!(s.from_hex());
let a = s.from_hex()?;
if a.len() != $size {
return Err(FromHexError::InvalidHexLength);
}
@@ -181,7 +181,7 @@ macro_rules! impl_hash {
impl fmt::Debug for $from {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
for i in &self.0[..] {
try!(write!(f, "{:02x}", i));
write!(f, "{:02x}", i)?;
}
Ok(())
}
@@ -190,11 +190,11 @@ macro_rules! impl_hash {
impl fmt::Display for $from {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
for i in &self.0[0..2] {
try!(write!(f, "{:02x}", i));
write!(f, "{:02x}", i)?;
}
try!(write!(f, "…"));
write!(f, "…")?;
for i in &self.0[$size - 2..$size] {
try!(write!(f, "{:02x}", i));
write!(f, "{:02x}", i)?;
}
Ok(())
}