Skip to content

Applied cargo clippy and minor fixes to examples #145

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.

Sign up for GitHub

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

Merged
grovesNL merged 1 commit into from
Jul 22, 2025
Merged

Applied cargo clippy and minor fixes to examples #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 6 additions & 9 deletions examples/custom-glyphs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,8 @@ impl WindowState {
let scale_x = input.width as f32 / svg_size.width();
let scale_y = input.height as f32 / svg_size.height();

let Some(mut pixmap) =
resvg::tiny_skia::Pixmap::new(input.width as u32, input.height as u32)
else {
return None;
};
let mut pixmap =
resvg::tiny_skia::Pixmap::new(input.width as u32, input.height as u32)?;

let mut transform = resvg::usvg::Transform::from_scale(scale_x, scale_y);

Expand Down Expand Up @@ -211,12 +208,12 @@ impl winit::application::ApplicationHandler for Application {
WindowEvent::Resized(size) => {
surface_config.width = size.width;
surface_config.height = size.height;
surface.configure(&device, &surface_config);
surface.configure(device, surface_config);
window.request_redraw();
}
WindowEvent::RedrawRequested => {
viewport.update(
&queue,
queue,
Resolution {
width: surface_config.width,
height: surface_config.height,
Expand All @@ -231,7 +228,7 @@ impl winit::application::ApplicationHandler for Application {
atlas,
viewport,
[TextArea {
buffer: &text_buffer,
buffer: text_buffer,
left: 10.0,
top: 10.0,
scale: 1.0,
Expand Down Expand Up @@ -316,7 +313,7 @@ impl winit::application::ApplicationHandler for Application {
occlusion_query_set: None,
});

text_renderer.render(&atlas, &viewport, &mut pass).unwrap();
text_renderer.render(atlas, viewport, &mut pass).unwrap();
}

queue.submit(Some(encoder.finish()));
Expand Down
6 changes: 3 additions & 3 deletions examples/hello-world.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,12 @@ impl winit::application::ApplicationHandler for Application {
WindowEvent::Resized(size) => {
surface_config.width = size.width;
surface_config.height = size.height;
surface.configure(&device, &surface_config);
surface.configure(device, surface_config);
window.request_redraw();
}
WindowEvent::RedrawRequested => {
viewport.update(
&queue,
queue,
Resolution {
width: surface_config.width,
height: surface_config.height,
Expand Down Expand Up @@ -213,7 +213,7 @@ impl winit::application::ApplicationHandler for Application {
occlusion_query_set: None,
});

text_renderer.render(&atlas, &viewport, &mut pass).unwrap();
text_renderer.render(atlas, viewport, &mut pass).unwrap();
}

queue.submit(Some(encoder.finish()));
Expand Down
8 changes: 4 additions & 4 deletions examples/text-sizes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ impl WindowState {
surface,
surface_config,
physical_size: physical_size.cast(),
scale_factor: scale_factor as f32,
scale_factor,
font_system,
swash_cache,
viewport,
Expand Down Expand Up @@ -199,7 +199,7 @@ impl winit::application::ApplicationHandler for Application {
WindowEvent::Resized(size) => {
surface_config.width = size.width;
surface_config.height = size.height;
surface.configure(&device, &surface_config);
surface.configure(device, surface_config);
window.request_redraw();

*scale_factor = window.scale_factor() as f32;
Expand All @@ -214,7 +214,7 @@ impl winit::application::ApplicationHandler for Application {
}
WindowEvent::RedrawRequested => {
viewport.update(
&queue,
queue,
Resolution {
width: surface_config.width,
height: surface_config.height,
Expand Down Expand Up @@ -290,7 +290,7 @@ impl winit::application::ApplicationHandler for Application {
occlusion_query_set: None,
});

text_renderer.render(&atlas, &viewport, &mut pass).unwrap();
text_renderer.render(atlas, viewport, &mut pass).unwrap();
}

queue.submit(Some(encoder.finish()));
Expand Down