Skip to content

Commit c49b83a

Browse files
authored
style: simplify string formatting for readability (#987)
* style: simplify string formatting for readability * fix: formatting in `src/platform` directories
1 parent 4968a9e commit c49b83a

28 files changed

+67
-66
lines changed

examples/control_flow.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fn main() {
4444

4545
event_loop.run(move |event, _, control_flow| {
4646
use tao::event::StartCause;
47-
println!("{:?}", event);
47+
println!("{event:?}");
4848
match event {
4949
Event::NewEvents(start_cause) => {
5050
wait_cancelled = match start_cause {
@@ -69,19 +69,19 @@ fn main() {
6969
// See the `key_binding` example
7070
if Key::Character("1") == logical_key {
7171
mode = Mode::Wait;
72-
println!("\nmode: {:?}\n", mode);
72+
println!("\nmode: {mode:?}\n");
7373
}
7474
if Key::Character("2") == logical_key {
7575
mode = Mode::WaitUntil;
76-
println!("\nmode: {:?}\n", mode);
76+
println!("\nmode: {mode:?}\n");
7777
}
7878
if Key::Character("3") == logical_key {
7979
mode = Mode::Poll;
80-
println!("\nmode: {:?}\n", mode);
80+
println!("\nmode: {mode:?}\n");
8181
}
8282
if Key::Character("r") == logical_key {
8383
request_redraw = !request_redraw;
84-
println!("\nrequest_redraw: {}\n", request_redraw);
84+
println!("\nrequest_redraw: {request_redraw}\n");
8585
}
8686
if Key::Escape == logical_key {
8787
close_requested = true;

examples/cursor_grab.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ fn main() {
5252
_ => (),
5353
},
5454
Event::DeviceEvent { event, .. } => match event {
55-
DeviceEvent::MouseMotion { delta, .. } => println!("mouse moved: {:?}", delta),
55+
DeviceEvent::MouseMotion { delta, .. } => println!("mouse moved: {delta:?}"),
5656
DeviceEvent::Button { button, state, .. } => match state {
57-
ElementState::Pressed => println!("mouse button {} pressed", button),
58-
ElementState::Released => println!("mouse button {} released", button),
57+
ElementState::Pressed => println!("mouse button {button} pressed"),
58+
ElementState::Released => println!("mouse button {button} released"),
5959
_ => (),
6060
},
6161
_ => (),

examples/custom_events.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fn main() {
4040
*control_flow = ControlFlow::Wait;
4141

4242
match event {
43-
Event::UserEvent(event) => println!("user event: {:?}", event),
43+
Event::UserEvent(event) => println!("user event: {event:?}"),
4444
Event::WindowEvent {
4545
event: WindowEvent::CloseRequested,
4646
..

examples/decorations.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fn main() {
4040
..
4141
} => {
4242
decorations = !decorations;
43-
println!("Decorations: {}", decorations);
43+
println!("Decorations: {decorations}");
4444
window.set_decorations(decorations);
4545
}
4646
_ => (),

examples/fullscreen.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ fn prompt_for_monitor(event_loop: &EventLoop<()>) -> MonitorHandle {
109109

110110
fn prompt_for_video_mode(monitor: &MonitorHandle) -> VideoMode {
111111
for (i, video_mode) in monitor.video_modes().enumerate() {
112-
println!("Video mode #{}: {}", i, video_mode);
112+
println!("Video mode #{i}: {video_mode}");
113113
}
114114

115115
print!("Please write the number of the video mode to use: ");
@@ -123,7 +123,7 @@ fn prompt_for_video_mode(monitor: &MonitorHandle) -> VideoMode {
123123
.nth(num)
124124
.expect("Please enter a valid ID");
125125

126-
println!("Using {}", video_mode);
126+
println!("Using {video_mode}");
127127

128128
video_mode
129129
}

examples/mouse_wheel.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fn main() {
3030
Event::DeviceEvent { event, .. } => match event {
3131
DeviceEvent::MouseWheel { delta, .. } => match delta {
3232
tao::event::MouseScrollDelta::LineDelta(x, y) => {
33-
println!("mouse wheel Line Delta: ({},{})", x, y);
33+
println!("mouse wheel Line Delta: ({x},{y})");
3434
let pixels_per_line = 120.0;
3535
let mut pos = window.outer_position().unwrap();
3636
pos.x -= (x * pixels_per_line) as i32;

examples/multithreaded.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fn main() {
6868
..
6969
} => {
7070
use Key::{ArrowLeft, ArrowRight, Character};
71-
window.set_title(&format!("{:?}", key));
71+
window.set_title(&format!("{key:?}"));
7272
let state = !modifiers.shift_key();
7373
match &key {
7474
// WARNING: Consider using `key_without_modifers()` if available on your platform.

examples/multiwindow.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fn main() {
2929
{
3030
match event {
3131
WindowEvent::CloseRequested => {
32-
println!("Window {:?} has received the signal to close", window_id);
32+
println!("Window {window_id:?} has received the signal to close");
3333

3434
// This drops the window, causing it to close.
3535
windows.remove(&window_id);

examples/parentwindow.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fn main() {
5050
Event::WindowEvent {
5151
event, window_id, ..
5252
} if event == WindowEvent::CloseRequested => {
53-
println!("Window {:?} has received the signal to close", window_id);
53+
println!("Window {window_id:?} has received the signal to close");
5454
// This drop the window, causing it to close.
5555
windows.remove(&window_id);
5656
if windows.is_empty() {

examples/request_redraw.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn main() {
1919
.unwrap();
2020

2121
event_loop.run(move |event, _, control_flow| {
22-
println!("{:?}", event);
22+
println!("{event:?}");
2323

2424
*control_flow = ControlFlow::Wait;
2525

0 commit comments

Comments
 (0)