From e14e8e2e9acc7fb8debb7881d8891be5c3a13bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Mon, 5 Feb 2024 00:51:51 +0100 Subject: [PATCH] Fix new `beta` toolchain warnings --- examples/screenshot/src/main.rs | 6 +++--- examples/toast/src/main.rs | 2 +- examples/todos/src/main.rs | 2 +- examples/visible_bounds/src/main.rs | 20 +++++++++----------- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs index c5fe300482..64aa1a7a8c 100644 --- a/examples/screenshot/src/main.rs +++ b/examples/screenshot/src/main.rs @@ -228,8 +228,8 @@ 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:?}!"), - Err(msg) => { - format!("Png could not be saved due to:\n{msg:?}") + Err(PngError(error)) => { + format!("Png could not be saved due to:\n{}", error) } }; @@ -283,7 +283,7 @@ async fn save_to_png(screenshot: Screenshot) -> Result { ColorType::Rgba8, ) .map(|_| path) - .map_err(|err| PngError(format!("{err:?}"))) + .map_err(|error| PngError(error.to_string())) }) .await .expect("Blocking task to finish") diff --git a/examples/toast/src/main.rs b/examples/toast/src/main.rs index af29660a2c..7f067e2fae 100644 --- a/examples/toast/src/main.rs +++ b/examples/toast/src/main.rs @@ -332,7 +332,7 @@ mod toast { } fn tag(&self) -> widget::tree::Tag { - struct Marker(Vec); + struct Marker; widget::tree::Tag::of::() } diff --git a/examples/todos/src/main.rs b/examples/todos/src/main.rs index 88c4c2b481..eae127f7a4 100644 --- a/examples/todos/src/main.rs +++ b/examples/todos/src/main.rs @@ -152,7 +152,7 @@ impl Application for Todos { Command::none() } } - Message::Saved(_) => { + Message::Saved(_result) => { state.saving = false; saved = true; diff --git a/examples/visible_bounds/src/main.rs b/examples/visible_bounds/src/main.rs index fdf1e0f94c..33d76da842 100644 --- a/examples/visible_bounds/src/main.rs +++ b/examples/visible_bounds/src/main.rs @@ -25,7 +25,7 @@ struct Example { enum Message { MouseMoved(Point), WindowResized, - Scrolled(scrollable::Viewport), + Scrolled, OuterBoundsFetched(Option), InnerBoundsFetched(Option), } @@ -58,14 +58,12 @@ impl Application for Example { Command::none() } - Message::Scrolled(_) | Message::WindowResized => { - Command::batch(vec![ - container::visible_bounds(OUTER_CONTAINER.clone()) - .map(Message::OuterBoundsFetched), - container::visible_bounds(INNER_CONTAINER.clone()) - .map(Message::InnerBoundsFetched), - ]) - } + Message::Scrolled | Message::WindowResized => Command::batch(vec![ + container::visible_bounds(OUTER_CONTAINER.clone()) + .map(Message::OuterBoundsFetched), + container::visible_bounds(INNER_CONTAINER.clone()) + .map(Message::InnerBoundsFetched), + ]), Message::OuterBoundsFetched(outer_bounds) => { self.outer_bounds = outer_bounds; @@ -147,13 +145,13 @@ impl Application for Example { ] .padding(20) ) - .on_scroll(Message::Scrolled) + .on_scroll(|_| Message::Scrolled) .width(Length::Fill) .height(300), ] .padding(20) ) - .on_scroll(Message::Scrolled) + .on_scroll(|_| Message::Scrolled) .width(Length::Fill) .height(300), ]