Skip to content

merge #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
itmilos merged 4 commits into from
Apr 17, 2023
Merged

merge #1

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e93782
Try-state for Collective pallet (#13645)
Szegoo Apr 17, 2023
15bb9c6
imp function comparison (#13928)
itmilos Apr 17, 2023
915d22c
Update links in the Referenda Readme (#13929)
rzadp Apr 17, 2023
785115b
Balances: repatriate_reserved should respect freezes (#13885)
gavofyork Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
imp function comparison (paritytech#13928)
  • Loading branch information
@itmilos
itmilos authored Apr 17, 2023
commit 15bb9c61aecf73a3a7a1853151a27587edb34b97
23 changes: 6 additions & 17 deletions bin/node/bench/src/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,24 +72,13 @@ pub struct NsFormatter(pub u64);
impl fmt::Display for NsFormatter {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let v = self.0;

if v < 100 {
return write!(f, "{} ns", v)
}

if self.0 < 100_000 {
return write!(f, "{:.1} µs", v as f64 / 1000.0)
}

if self.0 < 1_000_000 {
return write!(f, "{:.4} ms", v as f64 / 1_000_000.0)
}

if self.0 < 100_000_000 {
return write!(f, "{:.1} ms", v as f64 / 1_000_000.0)
match v {
v if v < 100 => write!(f, "{} ns", v),
v if v < 100_000 => write!(f, "{:.1} µs", v as f64 / 1000.0),
v if v < 1_000_000 => write!(f, "{:.4} ms", v as f64 / 1_000_000.0),
v if v < 100_000_000 => write!(f, "{:.1} ms", v as f64 / 1_000_000.0),
_ => write!(f, "{:.4} s", v as f64 / 1_000_000_000.0),
}

write!(f, "{:.4} s", v as f64 / 1_000_000_000.0)
}
}

Expand Down