Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: Inline format args for ease of reading #2089

Merged
merged 1 commit into from
Sep 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions examples/game_of_life/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -610,8 +610,7 @@ mod grid {

frame.fill_text(Text {
content: format!(
"{} cell{} @ {:?} ({})",
cell_count,
"{cell_count} cell{} @ {:?} ({})",
if cell_count == 1 { "" } else { "s" },
self.last_tick_duration,
self.last_queued_ticks
Expand Down
10 changes: 5 additions & 5 deletions examples/screenshot/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ impl Application for Example {
.align_items(Alignment::Center);

if let Some(crop_error) = &self.crop_error {
crop_controls = crop_controls
.push(text(format!("Crop error! \n{}", crop_error)));
crop_controls =
crop_controls.push(text(format!("Crop error! \n{crop_error}")));
}

let mut controls = column![
Expand Down Expand Up @@ -221,9 +221,9 @@ impl Application for Example {

if let Some(png_result) = &self.saved_png_path {
let msg = match png_result {
Ok(path) => format!("Png saved as: {:?}!", path),
Ok(path) => format!("Png saved as: {path:?}!"),
Err(msg) => {
format!("Png could not be saved due to:\n{:?}", msg)
format!("Png could not be saved due to:\n{msg:?}")
}
};

Expand Down Expand Up @@ -281,7 +281,7 @@ async fn save_to_png(screenshot: Screenshot) -> Result<String, PngError> {
ColorType::Rgba8,
)
.map(|_| path)
.map_err(|err| PngError(format!("{:?}", err)))
.map_err(|err| PngError(format!("{err:?}")))
}

#[derive(Clone, Debug)]
Expand Down
4 changes: 2 additions & 2 deletions examples/system_information/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ impl Application for Example {
ByteSize::kb(information.memory_total).to_string();

let memory_total = text(format!(
"Memory (total): {} kb ({})",
information.memory_total, memory_readable
"Memory (total): {} kb ({memory_readable})",
information.memory_total,
));

let memory_text = if let Some(memory_used) =
Expand Down
3 changes: 1 addition & 2 deletions examples/todos/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,7 @@ fn view_controls(tasks: &[Task], current_filter: Filter) -> Element<Message> {

row![
text(format!(
"{} {} left",
tasks_left,
"{tasks_left} {} left",
if tasks_left == 1 { "task" } else { "tasks" }
))
.width(Length::Fill),
Expand Down
2 changes: 1 addition & 1 deletion examples/visible_bounds/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ impl Application for Example {
data_row(
label,
match bounds {
Some(bounds) => format!("{:?}", bounds),
Some(bounds) => format!("{bounds:?}"),
None => "not visible".to_string(),
},
if bounds
Expand Down
3 changes: 1 addition & 2 deletions futures/src/subscription/tracker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,7 @@ impl Tracker {
.for_each(|listener| {
if let Err(error) = listener.try_send((event.clone(), status)) {
log::warn!(
"Error sending event to subscription: {:?}",
error
"Error sending event to subscription: {error:?}"
);
}
});
Expand Down
2 changes: 1 addition & 1 deletion renderer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ impl<T> Renderer<T> {
pub fn draw_mesh(&mut self, mesh: Mesh) {
match self {
Self::TinySkia(_) => {
log::warn!("Unsupported mesh primitive: {:?}", mesh)
log::warn!("Unsupported mesh primitive: {mesh:?}")
}
#[cfg(feature = "wgpu")]
Self::Wgpu(renderer) => {
Expand Down
6 changes: 2 additions & 4 deletions tiny_skia/src/backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -443,8 +443,7 @@ impl Backend {
#[cfg(not(feature = "image"))]
Primitive::Image { .. } => {
log::warn!(
"Unsupported primitive in `iced_tiny_skia`: {:?}",
primitive
"Unsupported primitive in `iced_tiny_skia`: {primitive:?}",
);
}
#[cfg(feature = "svg")]
Expand Down Expand Up @@ -473,8 +472,7 @@ impl Backend {
#[cfg(not(feature = "svg"))]
Primitive::Svg { .. } => {
log::warn!(
"Unsupported primitive in `iced_tiny_skia`: {:?}",
primitive
"Unsupported primitive in `iced_tiny_skia`: {primitive:?}",
);
}
Primitive::Custom(primitive::Custom::Fill {
Expand Down
8 changes: 4 additions & 4 deletions wgpu/src/image/atlas.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ impl Atlas {
entry
};

log::info!("Allocated atlas entry: {:?}", entry);
log::info!("Allocated atlas entry: {entry:?}");

// It is a webgpu requirement that:
// BufferCopyView.layout.bytes_per_row % wgpu::COPY_BYTES_PER_ROW_ALIGNMENT == 0
Expand Down Expand Up @@ -139,13 +139,13 @@ impl Atlas {
}
}

log::info!("Current atlas: {:?}", self);
log::info!("Current atlas: {self:?}");

Some(entry)
}

pub fn remove(&mut self, entry: &Entry) {
log::info!("Removing atlas entry: {:?}", entry);
log::info!("Removing atlas entry: {entry:?}");

match entry {
Entry::Contiguous(allocation) => {
Expand Down Expand Up @@ -258,7 +258,7 @@ impl Atlas {
}

fn deallocate(&mut self, allocation: &Allocation) {
log::info!("Deallocating atlas: {:?}", allocation);
log::info!("Deallocating atlas: {allocation:?}");

match allocation {
Allocation::Full { layer } => {
Expand Down
2 changes: 1 addition & 1 deletion wgpu/src/image/vector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ impl Cache {
let allocation =
atlas.upload(device, encoder, width, height, &rgba)?;

log::debug!("allocating {} {}x{}", id, width, height);
log::debug!("allocating {id} {width}x{height}");

let _ = self.svg_hits.insert(id);
let _ = self.rasterized_hits.insert(key);
Expand Down
6 changes: 3 additions & 3 deletions wgpu/src/window/compositor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ impl<Theme> Compositor<Theme> {
..Default::default()
});

log::info!("{:#?}", settings);
log::info!("{settings:#?}");

#[cfg(not(target_arch = "wasm32"))]
if log::max_level() >= log::LevelFilter::Info {
let available_adapters: Vec<_> = instance
.enumerate_adapters(settings.internal_backend)
.map(|adapter| adapter.get_info())
.collect();
log::info!("Available adapters: {:#?}", available_adapters);
log::info!("Available adapters: {available_adapters:#?}");
}

#[allow(unsafe_code)]
Expand Down Expand Up @@ -83,7 +83,7 @@ impl<Theme> Compositor<Theme> {
})
})?;

log::info!("Selected format: {:?}", format);
log::info!("Selected format: {format:?}");

#[cfg(target_arch = "wasm32")]
let limits = [wgpu::Limits::downlevel_webgl2_defaults()
Expand Down
4 changes: 2 additions & 2 deletions winit/src/application.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ where
)
.with_visible(false);

log::debug!("Window builder: {:#?}", builder);
log::debug!("Window builder: {builder:#?}");

let window = builder
.build(&event_loop)
Expand All @@ -174,7 +174,7 @@ where
let body = document.body().unwrap();

let target = target.and_then(|target| {
body.query_selector(&format!("#{}", target))
body.query_selector(&format!("#{target}"))
.ok()
.unwrap_or(None)
});
Expand Down
2 changes: 1 addition & 1 deletion winit/src/clipboard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ impl Clipboard {
State::Connected(clipboard) => match clipboard.write(contents) {
Ok(()) => {}
Err(error) => {
log::warn!("error writing to clipboard: {}", error)
log::warn!("error writing to clipboard: {error}")
}
},
State::Unavailable => {}
Expand Down