1
0
mirror of https://github.com/BurntSushi/ripgrep.git synced 2025-08-04 21:52:54 +02:00

style: simplify string formatting

Most of this code was written before this was supported by Rust.

Closes #2912
This commit is contained in:
Hamir Mahal
2024-10-16 09:03:15 -07:00
committed by Andrew Gallant
parent e169881a36
commit f1b4b182f2
5 changed files with 11 additions and 12 deletions

View File

@ -21,35 +21,35 @@ impl Message {
fn unwrap_begin(&self) -> Begin {
match *self {
Message::Begin(ref x) => x.clone(),
ref x => panic!("expected Message::Begin but got {:?}", x),
ref x => panic!("expected Message::Begin but got {x:?}"),
}
}
fn unwrap_end(&self) -> End {
match *self {
Message::End(ref x) => x.clone(),
ref x => panic!("expected Message::End but got {:?}", x),
ref x => panic!("expected Message::End but got {x:?}"),
}
}
fn unwrap_match(&self) -> Match {
match *self {
Message::Match(ref x) => x.clone(),
ref x => panic!("expected Message::Match but got {:?}", x),
ref x => panic!("expected Message::Match but got {x:?}"),
}
}
fn unwrap_context(&self) -> Context {
match *self {
Message::Context(ref x) => x.clone(),
ref x => panic!("expected Message::Context but got {:?}", x),
ref x => panic!("expected Message::Context but got {x:?}"),
}
}
fn unwrap_summary(&self) -> Summary {
match *self {
Message::Summary(ref x) => x.clone(),
ref x => panic!("expected Message::Summary but got {:?}", x),
ref x => panic!("expected Message::Summary but got {x:?}"),
}
}
}

View File

@ -75,7 +75,7 @@ impl Dir {
.expect("executable's directory")
.to_path_buf();
let dir =
env::temp_dir().join(TEST_DIR).join(name).join(&format!("{}", id));
env::temp_dir().join(TEST_DIR).join(name).join(&format!("{id}"));
if dir.exists() {
nice_err(&dir, fs::remove_dir_all(&dir));
}