me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix: Clippy lint 'uninlined_format_args'

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
examples/download_progress/src/main.rs
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 :(",

2
examples/events/src/main.rs
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(),
);

2
examples/game_of_life/src/main.rs
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)

2
examples/integration_opengl/src/controls.rs
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),
),

2
examples/integration_opengl/src/scene.rs
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) {

2
examples/integration_wgpu/src/controls.rs
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),
)

2
examples/integration_wgpu/src/main.rs
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.

8
examples/pokedex/src/main.rs
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"))]

2
examples/styling/src/main.rs
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,

5
examples/system_information/src/main.rs
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: {}",

2
examples/todos/src/main.rs
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 {

8
examples/tour/src/main.rs
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),
)

2
examples/websocket/src/echo.rs
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}"),
}
}
}

2
examples/websocket/src/echo/server.rs
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}");
});
}
});

2
glow/src/program.rs
View file

@ -54,7 +54,7 @@ impl Version {
String::from("#version 120\n#define in varying"),
),
// OpenGL 1.1+
_ => panic!("Incompatible context version: {:?}", version),
_ => panic!("Incompatible context version: {version:?}"),
};
log::info!("Shader directive: {}", vertex.lines().next().unwrap());

6
native/src/command/action.rs
View file

@ -58,10 +58,10 @@ impl<T> fmt::Debug for Action<T> {
match self {
Self::Future(_) => write!(f, "Action::Future"),
Self::Clipboard(action) => {
write!(f, "Action::Clipboard({:?})", action)
write!(f, "Action::Clipboard({action:?})")
}
Self::Window(action) => write!(f, "Action::Window({:?})", action),
Self::System(action) => write!(f, "Action::System({:?})", action),
Self::Window(action) => write!(f, "Action::Window({action:?})"),
Self::System(action) => write!(f, "Action::System({action:?})"),
Self::Widget(_action) => write!(f, "Action::Widget"),
}
}

8
native/src/debug/basic.rs
View file

@ -133,7 +133,7 @@ impl Debug {
}
pub fn log_message<Message: std::fmt::Debug>(&mut self, message: &Message) {
self.last_messages.push_back(format!("{:?}", message));
self.last_messages.push_back(format!("{message:?}"));
if self.last_messages.len() > 10 {
let _ = self.last_messages.pop_front();
@ -150,7 +150,7 @@ impl Debug {
let mut lines = Vec::new();
fn key_value<T: std::fmt::Debug>(key: &str, value: T) -> String {
format!("{} {:?}", key, value)
format!("{key} {value:?}")
}
lines.push(format!(
@ -176,9 +176,9 @@ impl Debug {
lines.push(String::from("Last messages:"));
lines.extend(self.last_messages.iter().map(|msg| {
if msg.len() <= 100 {
format!(" {}", msg)
format!(" {msg}")
} else {
format!(" {:.100}...", msg)
format!(" {msg:.100}...")
}
}));

4
native/src/image.rs
View file

@ -107,10 +107,10 @@ pub enum Data {
impl std::fmt::Debug for Data {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Data::Path(path) => write!(f, "Path({:?})", path),
Data::Path(path) => write!(f, "Path({path:?})"),
Data::Bytes(_) => write!(f, "Bytes(...)"),
Data::Rgba { width, height, .. } => {
write!(f, "Pixels({} * {})", width, height)
write!(f, "Pixels({width} * {height})")
}
}
}

2
native/src/svg.rs
View file

@ -71,7 +71,7 @@ pub enum Data {
impl std::fmt::Debug for Data {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Data::Path(path) => write!(f, "Path({:?})", path),
Data::Path(path) => write!(f, "Path({path:?})"),
Data::Bytes(_) => write!(f, "Bytes(...)"),
}
}

2
native/src/widget/operation.rs
View file

@ -62,7 +62,7 @@ where
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Self::None => write!(f, "Outcome::None"),
Self::Some(output) => write!(f, "Outcome::Some({:?})", output),
Self::Some(output) => write!(f, "Outcome::Some({output:?})"),
Self::Chain(_) => write!(f, "Outcome::Chain(...)"),
}
}

11
native/src/window/action.rs
View file

@ -106,15 +106,14 @@ impl<T> fmt::Debug for Action<T> {
Self::Drag => write!(f, "Action::Drag"),
Self::Resize { width, height } => write!(
f,
"Action::Resize {{ widget: {}, height: {} }}",
width, height
"Action::Resize {{ widget: {width}, height: {height} }}"
),
Self::Maximize(value) => write!(f, "Action::Maximize({})", value),
Self::Minimize(value) => write!(f, "Action::Minimize({}", value),
Self::Maximize(value) => write!(f, "Action::Maximize({value})"),
Self::Minimize(value) => write!(f, "Action::Minimize({value}"),
Self::Move { x, y } => {
write!(f, "Action::Move {{ x: {}, y: {} }}", x, y)
write!(f, "Action::Move {{ x: {x}, y: {y} }}")
}
Self::SetMode(mode) => write!(f, "Action::SetMode({:?})", mode),
Self::SetMode(mode) => write!(f, "Action::SetMode({mode:?})"),
Self::FetchMode(_) => write!(f, "Action::FetchMode"),
Self::ToggleMaximize => write!(f, "Action::ToggleMaximize"),
Self::ToggleDecorations => write!(f, "Action::ToggleDecorations"),

15
src/window/icon.rs
View file

@ -133,10 +133,9 @@ impl fmt::Display for Error {
Error::InvalidData { byte_count } => {
write!(
f,
"The provided RGBA data (with length {:?}) isn't divisble by \
"The provided RGBA data (with length {byte_count:?}) isn't divisble by \
4. Therefore, it cannot be safely interpreted as 32bpp RGBA \
pixels.",
byte_count,
pixels."
)
}
Error::DimensionsMismatch {
@ -146,20 +145,18 @@ impl fmt::Display for Error {
} => {
write!(
f,
"The number of RGBA pixels ({:?}) does not match the provided \
dimensions ({:?}x{:?}).",
pixel_count, width, height,
"The number of RGBA pixels ({pixel_count:?}) does not match the provided \
dimensions ({width:?}x{height:?})."
)
}
Error::OsError(e) => write!(
f,
"The underlying OS failed to create the window \
icon: {:?}",
e
icon: {e:?}"
),
#[cfg(feature = "image_rs")]
Error::ImageError(e) => {
write!(f, "Unable to create icon from a file: {:?}", e)
write!(f, "Unable to create icon from a file: {e:?}")
}
}
}

2
wgpu/src/settings.rs
View file

@ -83,7 +83,7 @@ fn backend_from_env() -> Option<wgpu::Backends> {
"gl" => wgpu::Backends::GL,
"webgpu" => wgpu::Backends::BROWSER_WEBGPU,
"primary" => wgpu::Backends::PRIMARY,
other => panic!("Unknown backend: {}", other),
other => panic!("Unknown backend: {other}"),
}
})
}

2
winit/src/application.rs
View file

@ -535,7 +535,7 @@ async fn run_instance<A, E, C>(
Err(error) => match error {
// This is an unrecoverable error.
compositor::SurfaceError::OutOfMemory => {
panic!("{:?}", error);
panic!("{error:?}");
}
_ => {
debug.render_finished();

4
winit/src/application/profiler.rs
View file

@ -49,8 +49,8 @@ impl Profiler {
.to_str()
.unwrap_or("trace");
let path = out_dir
.join(format!("{}_trace_{}.json", curr_exe_name, time));
let path =
out_dir.join(format!("{curr_exe_name}_trace_{time}.json"));
layer = layer.file(path);
} else {