summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar 13r0ck <brock@szu.email>2023-01-27 13:25:04 -0700
committerLibravatar 13r0ck <brock@szu.email>2023-01-27 14:02:48 -0700
commit42b1bfe66d2407901c1ae640f80ce9e0d3c64b60 (patch)
tree2057c57df0c36096d1c3cd6334bc16e767f8169e
parente6092e81a42efe0bbaaad2e7ce475c25a379e672 (diff)
downloadiced-42b1bfe66d2407901c1ae640f80ce9e0d3c64b60.tar.gz
iced-42b1bfe66d2407901c1ae640f80ce9e0d3c64b60.tar.bz2
iced-42b1bfe66d2407901c1ae640f80ce9e0d3c64b60.zip
Fix: Clippy lint 'uninlined_format_args'
-rw-r--r--examples/download_progress/src/main.rs2
-rw-r--r--examples/events/src/main.rs2
-rw-r--r--examples/game_of_life/src/main.rs2
-rw-r--r--examples/integration_opengl/src/controls.rs2
-rw-r--r--examples/integration_opengl/src/scene.rs2
-rw-r--r--examples/integration_wgpu/src/controls.rs2
-rw-r--r--examples/integration_wgpu/src/main.rs2
-rw-r--r--examples/pokedex/src/main.rs8
-rw-r--r--examples/styling/src/main.rs2
-rw-r--r--examples/system_information/src/main.rs5
-rw-r--r--examples/todos/src/main.rs2
-rw-r--r--examples/tour/src/main.rs8
-rw-r--r--examples/websocket/src/echo.rs2
-rw-r--r--examples/websocket/src/echo/server.rs2
-rw-r--r--glow/src/program.rs2
-rw-r--r--native/src/command/action.rs6
-rw-r--r--native/src/debug/basic.rs8
-rw-r--r--native/src/image.rs4
-rw-r--r--native/src/svg.rs2
-rw-r--r--native/src/widget/operation.rs2
-rw-r--r--native/src/window/action.rs11
-rw-r--r--src/window/icon.rs15
-rw-r--r--wgpu/src/settings.rs2
-rw-r--r--winit/src/application.rs2
-rw-r--r--winit/src/application/profiler.rs4
25 files changed, 47 insertions, 54 deletions
diff --git a/examples/download_progress/src/main.rs b/examples/download_progress/src/main.rs
index 3ef9ef7a..001a1f8f 100644
--- a/examples/download_progress/src/main.rs
+++ b/examples/download_progress/src/main.rs
@@ -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 :(",
diff --git a/examples/events/src/main.rs b/examples/events/src/main.rs
index 4ae8d6fb..0e583479 100644
--- a/examples/events/src/main.rs
+++ b/examples/events/src/main.rs
@@ -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(),
);
diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs
index b0f1c96d..ed911160 100644
--- a/examples/game_of_life/src/main.rs
+++ b/examples/game_of_life/src/main.rs
@@ -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)
diff --git a/examples/integration_opengl/src/controls.rs b/examples/integration_opengl/src/controls.rs
index 076d37d3..22c41066 100644
--- a/examples/integration_opengl/src/controls.rs
+++ b/examples/integration_opengl/src/controls.rs
@@ -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),
),
diff --git a/examples/integration_opengl/src/scene.rs b/examples/integration_opengl/src/scene.rs
index fc74b78a..c1d05b65 100644
--- a/examples/integration_opengl/src/scene.rs
+++ b/examples/integration_opengl/src/scene.rs
@@ -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) {
diff --git a/examples/integration_wgpu/src/controls.rs b/examples/integration_wgpu/src/controls.rs
index 6c41738c..92300a45 100644
--- a/examples/integration_wgpu/src/controls.rs
+++ b/examples/integration_wgpu/src/controls.rs
@@ -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),
)
diff --git a/examples/integration_wgpu/src/main.rs b/examples/integration_wgpu/src/main.rs
index 70f9a48b..2a56b6fa 100644
--- a/examples/integration_wgpu/src/main.rs
+++ b/examples/integration_wgpu/src/main.rs
@@ -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.
diff --git a/examples/pokedex/src/main.rs b/examples/pokedex/src/main.rs
index 4fe2d07c..748acae0 100644
--- a/examples/pokedex/src/main.rs
+++ b/examples/pokedex/src/main.rs
@@ -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"))]
diff --git a/examples/styling/src/main.rs b/examples/styling/src/main.rs
index e16860ad..49bedce7 100644
--- a/examples/styling/src/main.rs
+++ b/examples/styling/src/main.rs
@@ -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,
diff --git a/examples/system_information/src/main.rs b/examples/system_information/src/main.rs
index 175b4387..633b6e2b 100644
--- a/examples/system_information/src/main.rs
+++ b/examples/system_information/src/main.rs
@@ -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: {}",
diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs
index 690d9c09..04411ed7 100644
--- a/examples/todos/src/main.rs
+++ b/examples/todos/src/main.rs
@@ -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 {
diff --git a/examples/tour/src/main.rs b/examples/tour/src/main.rs
index 378508e1..5ee65562 100644
--- a/examples/tour/src/main.rs
+++ b/examples/tour/src/main.rs
@@ -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),
)
diff --git a/examples/websocket/src/echo.rs b/examples/websocket/src/echo.rs
index ae65e064..e74768a6 100644
--- a/examples/websocket/src/echo.rs
+++ b/examples/websocket/src/echo.rs
@@ -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}"),
}
}
}
diff --git a/examples/websocket/src/echo/server.rs b/examples/websocket/src/echo/server.rs
index fef89a12..dd234984 100644
--- a/examples/websocket/src/echo/server.rs
+++ b/examples/websocket/src/echo/server.rs
@@ -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}");
});
}
});
diff --git a/glow/src/program.rs b/glow/src/program.rs
index 1eb9c535..e2155222 100644
--- a/glow/src/program.rs
+++ b/glow/src/program.rs
@@ -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());
diff --git a/native/src/command/action.rs b/native/src/command/action.rs
index a6954f8f..a51b8c21 100644
--- a/native/src/command/action.rs
+++ b/native/src/command/action.rs
@@ -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"),
}
}
diff --git a/native/src/debug/basic.rs b/native/src/debug/basic.rs
index 603f2fd5..92f614da 100644
--- a/native/src/debug/basic.rs
+++ b/native/src/debug/basic.rs
@@ -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}...")
}
}));
diff --git a/native/src/image.rs b/native/src/image.rs
index 06fd7ae6..5d2843c9 100644
--- a/native/src/image.rs
+++ b/native/src/image.rs
@@ -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})")
}
}
}
diff --git a/native/src/svg.rs b/native/src/svg.rs
index 2168e409..9b98877a 100644
--- a/native/src/svg.rs
+++ b/native/src/svg.rs
@@ -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(...)"),
}
}
diff --git a/native/src/widget/operation.rs b/native/src/widget/operation.rs
index 73e6a6b0..53688a21 100644
--- a/native/src/widget/operation.rs
+++ b/native/src/widget/operation.rs
@@ -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(...)"),
}
}
diff --git a/native/src/window/action.rs b/native/src/window/action.rs
index 37fcc273..525434e4 100644
--- a/native/src/window/action.rs
+++ b/native/src/window/action.rs
@@ -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"),
diff --git a/src/window/icon.rs b/src/window/icon.rs
index bacad41a..d57eb79c 100644
--- a/src/window/icon.rs
+++ b/src/window/icon.rs
@@ -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:?}")
}
}
}
diff --git a/wgpu/src/settings.rs b/wgpu/src/settings.rs
index 7bc752ff..21c2427d 100644
--- a/wgpu/src/settings.rs
+++ b/wgpu/src/settings.rs
@@ -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}"),
}
})
}
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 77ca4b31..8c841533 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -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();
diff --git a/winit/src/application/profiler.rs b/winit/src/application/profiler.rs
index 23eaa390..7031507a 100644
--- a/winit/src/application/profiler.rs
+++ b/winit/src/application/profiler.rs
@@ -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 {