zecfoundation
/
parity-zcash
mirror of https://github.com/ZcashFoundation/parity-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed redundant macro

This commit is contained in:
debris 2016-09-15 15:36:55 +02:00
parent 5fed103775
commit 28582e7acb
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/script/script.rs
View File

@ -323,15 +323,6 @@ fn read_usize(data: &[u8], size: usize) -> Result<usize, Error> {
Ok(result)
}
macro_rules! try_or_fmt {
($fmt: expr, $expr: expr) => {
match $expr {
Ok(o) => o,
Err(e) => return e.fmt($fmt),
}
}
}
impl fmt::Debug for Script {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str(&self.data.to_hex())
@ -343,7 +334,10 @@ impl fmt::Display for Script {
let mut pc = 0;
while pc < self.len() {
let instruction = try_or_fmt!(f, self.get_instruction(pc));
let instruction = match self.get_instruction(pc) {
Ok(i) => i,
Err(e) => return e.fmt(f),
};
match instruction.data {
Some(data) => try!(writeln!(f, "{:?} 0x{}", instruction.opcode, data.to_hex())),