Fix: Clippy lint 'uninlined_format_args'

This commit is contained in:
13r0ck 2023-01-27 13:25:04 -07:00
parent e6092e81a4
commit 42b1bfe66d
25 changed files with 47 additions and 54 deletions

View file

@ -177,7 +177,7 @@ impl Download {
.into()
}
State::Downloading { .. } => {
text(format!("Downloading... {:.2}%", current_progress)).into()
text(format!("Downloading... {current_progress:.2}%")).into()
}
State::Errored => column![
"Something went wrong :(",

View file

@ -77,7 +77,7 @@ impl Application for Events {
let events = Column::with_children(
self.last
.iter()
.map(|event| text(format!("{:?}", event)).size(40))
.map(|event| text(format!("{event:?}")).size(40))
.map(Element::from)
.collect(),
);

View file

@ -176,7 +176,7 @@ fn view_controls<'a>(
let speed_controls = row![
slider(1.0..=1000.0, speed as f32, Message::SpeedChanged),
text(format!("x{}", speed)).size(16),
text(format!("x{speed}")).size(16),
]
.width(Length::Fill)
.align_items(Alignment::Center)

View file

@ -90,7 +90,7 @@ impl Program for Controls {
)
.push(sliders)
.push(
Text::new(format!("{:?}", background_color))
Text::new(format!("{background_color:?}"))
.size(14)
.style(Color::WHITE),
),

View file

@ -49,7 +49,7 @@ impl Scene {
.expect("Cannot create shader");
gl.shader_source(
shader,
&format!("{}\n{}", shader_version, shader_source),
&format!("{shader_version}\n{shader_source}"),
);
gl.compile_shader(shader);
if !gl.get_shader_compile_status(shader) {

View file

@ -96,7 +96,7 @@ impl Program for Controls {
)
.push(sliders)
.push(
Text::new(format!("{:?}", background_color))
Text::new(format!("{background_color:?}"))
.size(14)
.style(Color::WHITE),
)

View file

@ -274,7 +274,7 @@ pub fn main() {
}
Err(error) => match error {
wgpu::SurfaceError::OutOfMemory => {
panic!("Swapchain error: {}. Rendering cannot continue.", error)
panic!("Swapchain error: {error}. Rendering cannot continue.")
}
_ => {
// Try rendering again next frame.

View file

@ -41,7 +41,7 @@ impl Application for Pokedex {
Pokedex::Errored { .. } => "Whoops!",
};
format!("{} - Pokédex", subtitle)
format!("{subtitle} - Pokédex")
}
fn update(&mut self, message: Message) -> Command<Message> {
@ -157,8 +157,7 @@ impl Pokemon {
};
let fetch_entry = async {
let url =
format!("https://pokeapi.co/api/v2/pokemon-species/{}", id);
let url = format!("https://pokeapi.co/api/v2/pokemon-species/{id}");
reqwest::get(&url).await?.json().await
};
@ -187,8 +186,7 @@ impl Pokemon {
async fn fetch_image(id: u16) -> Result<image::Handle, reqwest::Error> {
let url = format!(
"https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/{}.png",
id
"https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/{id}.png"
);
#[cfg(not(target_arch = "wasm32"))]

View file

@ -78,7 +78,7 @@ impl Sandbox for Styling {
column![text("Choose a theme:")].spacing(10),
|column, theme| {
column.push(radio(
format!("{:?}", theme),
format!("{theme:?}"),
*theme,
Some(match self.theme {
Theme::Light => ThemeType::Light,

View file

@ -114,13 +114,12 @@ impl Application for Example {
{
let memory_readable = ByteSize::kb(memory_used).to_string();
format!("{} kb ({})", memory_used, memory_readable)
format!("{memory_used} kb ({memory_readable})")
} else {
String::from("None")
};
let memory_used =
text(format!("Memory (used): {}", memory_text));
let memory_used = text(format!("Memory (used): {memory_text}"));
let graphics_adapter = text(format!(
"Graphics adapter: {}",

View file

@ -303,7 +303,7 @@ pub enum TaskMessage {
impl Task {
fn text_input_id(i: usize) -> text_input::Id {
text_input::Id::new(format!("task-{}", i))
text_input::Id::new(format!("task-{i}"))
}
fn new(description: String) -> Self {

View file

@ -388,7 +388,7 @@ impl<'a> Step {
let spacing_section = column![
slider(0..=80, spacing, StepMessage::SpacingChanged),
text(format!("{} px", spacing))
text(format!("{spacing} px"))
.width(Length::Fill)
.horizontal_alignment(alignment::Horizontal::Center),
]
@ -412,7 +412,7 @@ impl<'a> Step {
fn text(size: u16, color: Color) -> Column<'a, StepMessage> {
let size_section = column![
"You can change its size:",
text(format!("This text is {} pixels", size)).size(size),
text(format!("This text is {size} pixels")).size(size),
slider(10..=70, size, StepMessage::TextSizeChanged),
]
.padding(20)
@ -427,7 +427,7 @@ impl<'a> Step {
let color_section = column![
"And its color:",
text(format!("{:?}", color)).style(color),
text(format!("{color:?}")).style(color),
color_sliders,
]
.padding(20)
@ -497,7 +497,7 @@ impl<'a> Step {
.push(ferris(width))
.push(slider(100..=500, width, StepMessage::ImageWidthChanged))
.push(
text(format!("Width: {} px", width))
text(format!("Width: {width} px"))
.width(Length::Fill)
.horizontal_alignment(alignment::Horizontal::Center),
)

View file

@ -141,7 +141,7 @@ impl fmt::Display for Message {
Message::Disconnected => {
write!(f, "Connection lost... Retrying...")
}
Message::User(message) => write!(f, "{}", message),
Message::User(message) => write!(f, "{message}"),
}
}
}

View file

@ -41,7 +41,7 @@ async fn user_connected(ws: WebSocket) {
tokio::task::spawn(async move {
while let Some(message) = rx.next().await {
user_ws_tx.send(message).await.unwrap_or_else(|e| {
eprintln!("websocket send error: {}", e);
eprintln!("websocket send error: {e}");
});
}
});