OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #76959 - est31:write, r=oli-obk

Browse Source 
Replace write_fmt with write!

Latter is simpler
This commit is contained in:
Ralf Jung 2020-09-21 10:40:41 +02:00 committed by GitHub
commit f957aeef9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/test/src/bench.rs
View File

@ -61,15 +61,15 @@ pub fn fmt_bench_samples(bs: &BenchSamples) -> String {
let median = bs.ns_iter_summ.median as usize;
let deviation = (bs.ns_iter_summ.max - bs.ns_iter_summ.min) as usize;
output
.write_fmt(format_args!(
"{:>11} ns/iter (+/- {})",
fmt_thousands_sep(median, ','),
fmt_thousands_sep(deviation, ',')
))
.unwrap();
write!(
output,
"{:>11} ns/iter (+/- {})",
fmt_thousands_sep(median, ','),
fmt_thousands_sep(deviation, ',')
)
.unwrap();
if bs.mb_s != 0 {
output.write_fmt(format_args!(" = {} MB/s", bs.mb_s)).unwrap();
write!(output, " = {} MB/s", bs.mb_s).unwrap();
}
output
}
@ -83,9 +83,9 @@ fn fmt_thousands_sep(mut n: usize, sep: char) -> String {
let base = 10_usize.pow(pow);
if pow == 0 || trailing || n / base != 0 {
if !trailing {
output.write_fmt(format_args!("{}", n / base)).unwrap();
write!(output, "{}", n / base).unwrap();
} else {
output.write_fmt(format_args!("{:03}", n / base)).unwrap();
write!(output, "{:03}", n / base).unwrap();
}
if pow != 0 {
output.push(sep);

4
src/tools/unstable-book-gen/src/main.rs
View File

@ -27,12 +27,12 @@ macro_rules! t {
fn generate_stub_issue(path: &Path, name: &str, issue: u32) {
let mut file = t!(File::create(path));
t!(file.write_fmt(format_args!(include_str!("stub-issue.md"), name = name, issue = issue)));
t!(write!(file, include_str!("stub-issue.md"), name = name, issue = issue));
}
fn generate_stub_no_issue(path: &Path, name: &str) {
let mut file = t!(File::create(path));
t!(file.write_fmt(format_args!(include_str!("stub-no-issue.md"), name = name)));
t!(write!(file, include_str!("stub-no-issue.md"), name = name));
}
fn set_to_summary_str(set: &BTreeSet<String>, dir: &str) -> String {