1
0
mirror of https://github.com/emilk/egui.git synced 2026-08-31 13:50:04 -04:00

CI: Run cargo clippy for wasm32-unknown-unknown (#2200)

* CI: Run cargo clippy for wasm32-unknown-unknown

* wasm32 clippy fixes

* Document when AppRunner::new can fail
This commit is contained in:
Emil Ernerfeldt
2022-10-30 20:55:07 +01:00
committed by GitHub
parent 53b800502a
commit 2b1341095d
10 changed files with 39 additions and 24 deletions

View File

@@ -101,7 +101,7 @@ fn web_location() -> epi::Location {
let query_map = parse_query_map(&query)
.iter()
.map(|(k, v)| ((*k).to_string(), (*v).to_string()))
.map(|(k, v)| ((*k).to_owned(), (*v).to_owned()))
.collect();
epi::Location {
@@ -181,14 +181,14 @@ impl Drop for AppRunner {
}
impl AppRunner {
/// # Errors
/// Failure to initialize WebGL renderer.
pub async fn new(
canvas_id: &str,
web_options: crate::WebOptions,
app_creator: epi::AppCreator,
) -> Result<Self, JsValue> {
let painter = ActiveWebPainter::new(canvas_id, &web_options)
.await
.map_err(JsValue::from)?;
) -> Result<Self, String> {
let painter = ActiveWebPainter::new(canvas_id, &web_options).await?;
let system_theme = if web_options.follow_system_theme {
super::system_theme()
@@ -469,9 +469,6 @@ pub struct AppRunnerContainer {
impl AppRunnerContainer {
/// Convenience function to reduce boilerplate and ensure that all event handlers
/// are dealt with in the same way
///
#[must_use]
pub fn add_event_listener<E: wasm_bindgen::JsCast>(
&mut self,
target: &EventTarget,
@@ -502,7 +499,7 @@ impl AppRunnerContainer {
let handle = TargetEvent {
target: target.clone(),
event_name: event_name.to_string(),
event_name: event_name.to_owned(),
closure,
};

View File

@@ -203,7 +203,7 @@ pub fn install_canvas_events(runner_container: &mut AppRunnerContainer) -> Resul
let closure =
move |event: web_sys::MouseEvent,
mut _runner_lock: egui::mutex::MutexGuard<AppRunner>| {
mut _runner_lock: egui::mutex::MutexGuard<'_, AppRunner>| {
event.prevent_default();
};
@@ -213,7 +213,7 @@ pub fn install_canvas_events(runner_container: &mut AppRunnerContainer) -> Resul
runner_container.add_event_listener(
&canvas,
"mousedown",
|event: web_sys::MouseEvent, mut runner_lock: egui::mutex::MutexGuard<AppRunner>| {
|event: web_sys::MouseEvent, mut runner_lock: egui::mutex::MutexGuard<'_, AppRunner>| {
if let Some(button) = button_from_mouse_event(&event) {
let pos = pos_from_mouse_event(runner_lock.canvas_id(), &event);
let modifiers = runner_lock.input.raw.modifiers;

View File

@@ -54,8 +54,8 @@ pub fn pos_from_touch_event(
fn pos_from_touch(canvas_origin: egui::Pos2, touch: &web_sys::Touch) -> egui::Pos2 {
egui::Pos2 {
x: touch.page_x() as f32 - canvas_origin.x as f32,
y: touch.page_y() as f32 - canvas_origin.y as f32,
x: touch.page_x() as f32 - canvas_origin.x,
y: touch.page_y() as f32 - canvas_origin.y,
}
}

View File

@@ -72,7 +72,7 @@ impl WebPainter for WebPainterGlow {
}
fn destroy(&mut self) {
self.painter.destroy()
self.painter.destroy();
}
}

View File

@@ -116,7 +116,7 @@ impl WebPainter for WebPainterWgpu {
alpha_mode: wgpu::CompositeAlphaMode::Auto,
},
);
self.surface_size = canvas_size.clone();
self.surface_size = canvas_size;
}
let frame = self.surface.get_current_texture().map_err(|err| {