milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Use &mut dyn fmt::Write instead of bool 

This replaces manually-written dynamic dispatch with `&mut dyn
fmt::Write` which is hopefully more readable.
This commit is contained in:
Martin Habovstiak 2021-04-09 17:58:35 +02:00
parent 85ae82febb
commit bc406bfdd6
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/util/address.rs
View File

@ -393,9 +393,14 @@ impl fmt::Display for Address {
Network::Testnet | Network::Signet => "tb", Network::Testnet | Network::Signet => "tb",
Network::Regtest => "bcrt", Network::Regtest => "bcrt",
}; };
let is_alternate = fmt.alternate(); let mut upper_writer;
let mut opt_up_writer = OptionallyUpperWriter(fmt, is_alternate); let writer = if fmt.alternate() {
let mut bech32_writer = bech32::Bech32Writer::new(hrp, &mut opt_up_writer)?; upper_writer = UpperWriter(fmt);
&mut upper_writer as &mut dyn fmt::Write
} else {
fmt as &mut dyn fmt::Write
};
let mut bech32_writer = bech32::Bech32Writer::new(hrp, writer)?;
bech32::WriteBase32::write_u5(&mut bech32_writer, ver)?; bech32::WriteBase32::write_u5(&mut bech32_writer, ver)?;
bech32::ToBase32::write_base32(&prog, &mut bech32_writer) bech32::ToBase32::write_base32(&prog, &mut bech32_writer)
} }
@ -403,17 +408,13 @@ impl fmt::Display for Address {
} }
} }
struct OptionallyUpperWriter<W: fmt::Write>(W, bool); struct UpperWriter<W: fmt::Write>(W);
impl<W: fmt::Write> fmt::Write for OptionallyUpperWriter<W> { impl<W: fmt::Write> fmt::Write for UpperWriter<W> {
fn write_str(&mut self, s: &str) -> fmt::Result { fn write_str(&mut self, s: &str) -> fmt::Result {
if self.1 {
for c in s.chars() { for c in s.chars() {
self.0.write_char(c.to_ascii_uppercase())?; self.0.write_char(c.to_ascii_uppercase())?;
} }
} else {
self.0.write_str(s)?;
}
Ok(()) Ok(())
} }
} }