Skip to content

Commit a463576

Browse files
committed
style: prefer string interpolation
1 parent ce88bd4 commit a463576

File tree

14 files changed

+74
-74
lines changed

14 files changed

+74
-74
lines changed

src/app.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ impl App {
8888
UnitAndTree::Blocks(reflection) => visualize!(reflection, ()),
8989
};
9090

91-
print!("{}", visualization); // it already ends with "\n", println! isn't needed here.
91+
print!("{visualization}"); // it already ends with "\n", println! isn't needed here.
9292
return Ok(());
9393
}
9494

src/app/sub.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ where
145145
max_depth,
146146
};
147147

148-
print!("{}", visualizer); // visualizer already ends with "\n", println! isn't needed here.
148+
print!("{visualizer}"); // visualizer already ends with "\n", println! isn't needed here.
149149
Ok(())
150150
}
151151
}

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub mod runtime_error;
1616
#[cfg(feature = "cli")]
1717
pub fn main() -> std::process::ExitCode {
1818
if let Err(error) = app::App::from_env().run() {
19-
eprintln!("[error] {}", error);
19+
eprintln!("[error] {error}");
2020
return std::process::ExitCode::FAILURE;
2121
}
2222
std::process::ExitCode::SUCCESS

src/os_string_display.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ where
7373
fn fmt(&self, formatter: &mut Formatter<'_>) -> Result<(), Error> {
7474
let inner = self.as_os_str();
7575
if let Some(utf8) = inner.to_str() {
76-
write!(formatter, "{}", utf8)
76+
write!(formatter, "{utf8}")
7777
} else {
78-
write!(formatter, "{:?}", inner)
78+
write!(formatter, "{inner:?}")
7979
}
8080
}
8181
}

src/reporter/progress_report.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ impl<Size: size::Size + Into<u64>> ProgressReport<Size> {
2929
)
3030
.unwrap();
3131
if errors != 0 {
32-
write!(text, ", erred {}", errors).unwrap();
32+
write!(text, ", erred {errors}").unwrap();
3333
}
3434
write!(text, ")").unwrap();
3535
GLOBAL_STATUS_BOARD.temporary_message(&text);

src/status_board.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ impl StatusBoard {
3232
/// Clear the line that the cursor is pointing to.
3333
pub fn clear_line(&self, new_line_width: usize) {
3434
let empty_line = repeat(' ', self.get_line_width());
35-
eprint!("\r{}\r", empty_line);
35+
eprint!("\r{empty_line}\r");
3636
self.set_line_width(new_line_width);
3737
}
3838

3939
/// Show a temporary message.
4040
pub fn temporary_message(&self, message: &str) {
4141
self.clear_line(message.width());
42-
eprint!("{}", message);
42+
eprint!("{message}");
4343
}
4444

4545
/// Log a permanent message.
4646
pub fn permanent_message(&self, message: &str) {
4747
self.clear_line(0);
48-
eprintln!("{}", message);
48+
eprintln!("{message}");
4949
}
5050
}

src/visualizer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ use std::{fmt::Display, num::NonZeroUsize};
4040
/// column_width_distribution: ColumnWidthDistribution::total(100),
4141
/// max_depth: std::num::NonZeroUsize::new(10).unwrap(),
4242
/// };
43-
/// println!("{}", visualizer);
43+
/// println!("{visualizer}");
4444
/// # }
4545
/// ```
4646
#[derive(Debug)]

src/visualizer/display.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ where
99
{
1010
/// Create the ASCII chart.
1111
fn fmt(&self, formatter: &mut Formatter<'_>) -> Result<(), Error> {
12-
let write = |line: &String| writeln!(formatter, "{}", line);
12+
let write = |line: &String| writeln!(formatter, "{line}");
1313
match self.direction {
1414
BottomUp => self.rows().iter().rev().try_for_each(write),
1515
TopDown => self.rows().iter().try_for_each(write),

src/visualizer/methods/initial_table.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ where
120120
"0%".to_string()
121121
} else {
122122
let percentage = rounded_div::u64(fs_size * 100, total_fs_size);
123-
format!("{}%", percentage)
123+
format!("{percentage}%")
124124
};
125125
let size = node.size().display(visualizer.bytes_format).to_string();
126126
let sibling_count = ancestors.last().map_or(1, |parent| parent.children_count);

tests/_utils.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ impl Drop for Temp {
5858
fn drop(&mut self) {
5959
let path = &self.0;
6060
if let Err(error) = remove_dir_all(path) {
61-
eprintln!("warning: Failed to delete {:?}: {}", path, error);
61+
eprintln!("warning: Failed to delete {path:?}: {error}");
6262
}
6363
}
6464
}
@@ -133,7 +133,7 @@ where
133133
let suffix_size = |suffix: &str| -> Size {
134134
root.join(suffix)
135135
.pipe(metadata)
136-
.unwrap_or_else(|error| panic!("get_size {}: {}", suffix, error))
136+
.unwrap_or_else(|error| panic!("get_size {suffix}: {error}"))
137137
.pipe(|ref metadata| size_getter.get_size(metadata))
138138
};
139139

@@ -327,6 +327,6 @@ pub fn inspect_stderr(stderr: &[u8]) {
327327
let text = String::from_utf8_lossy(stderr);
328328
let text = text.trim();
329329
if !text.is_empty() {
330-
eprintln!("STDERR:\n{}\n", text);
330+
eprintln!("STDERR:\n{text}\n");
331331
}
332332
}

0 commit comments

Comments
 (0)