Fix Clippy for 1.63 (#2825)

yewstack · Aug 12, 2022 · 989d804 · 989d804
1 parent f640fc7
commit 989d804
Show file tree

Hide file tree

Showing 29 changed files with 107 additions and 79 deletions.
diff --git a/examples/Cargo.lock b/examples/Cargo.lock
diff --git a/examples/contexts/src/msg_ctx.rs b/examples/contexts/src/msg_ctx.rs
@@ -2,7 +2,7 @@ use std::rc::Rc;
 
 use yew::prelude::*;
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub struct Message {
     pub inner: String,
 }

diff --git a/examples/function_memory_game/src/components/score_board.rs b/examples/function_memory_game/src/components/score_board.rs
@@ -4,7 +4,7 @@ use crate::components::score_board_best_score::BestScore;
 use crate::components::score_board_logo::Logo;
 use crate::components::score_board_progress::GameProgress;
 
-#[derive(PartialEq, Properties, Clone)]
+#[derive(PartialEq, Properties, Clone, Eq)]
 pub struct Props {
     pub unresolved_card_pairs: u8,
     pub best_score: u32,

diff --git a/examples/function_memory_game/src/components/score_board_best_score.rs b/examples/function_memory_game/src/components/score_board_best_score.rs
@@ -1,6 +1,6 @@
 use yew::{function_component, html, Html, Properties};
 
-#[derive(PartialEq, Properties, Clone)]
+#[derive(PartialEq, Eq, Properties, Clone)]
 pub struct Props {
     pub best_score: u32,
 }

diff --git a/examples/function_memory_game/src/components/score_board_progress.rs b/examples/function_memory_game/src/components/score_board_progress.rs
@@ -1,6 +1,6 @@
 use yew::{function_component, html, Html, Properties};
 
-#[derive(PartialEq, Properties, Clone)]
+#[derive(PartialEq, Eq, Properties, Clone)]
 pub struct Props {
     pub unresolved_card_pairs: u8,
 }

diff --git a/examples/function_memory_game/src/constant.rs b/examples/function_memory_game/src/constant.rs
@@ -3,7 +3,7 @@ use strum_macros::{Display, EnumIter};
 
 pub const KEY_BEST_SCORE: &str = "memory.game.best.score";
 
-#[derive(Clone, Copy, Debug, EnumIter, Display, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, EnumIter, Display, PartialEq, Eq, Serialize, Deserialize)]
 pub enum CardName {
     EightBall,
     Kronos,
@@ -15,7 +15,7 @@ pub enum CardName {
     Zeppelin,
 }
 
-#[derive(Clone, Copy, Debug, EnumIter, Display, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, EnumIter, Display, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Status {
     Ready,
     Playing,

diff --git a/examples/function_memory_game/src/state.rs b/examples/function_memory_game/src/state.rs
@@ -7,20 +7,20 @@ use yew::prelude::*;
 use crate::constant::{CardName, Status, KEY_BEST_SCORE};
 use crate::helper::shuffle_cards;
 
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
 pub struct RawCard {
     pub id: String,
     pub name: CardName,
 }
 
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
 pub struct Card {
     pub id: String,
     pub flipped: bool,
     pub name: CardName,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub struct State {
     pub unresolved_card_pairs: u8,
     pub best_score: u32,

diff --git a/examples/function_router/src/app.rs b/examples/function_router/src/app.rs
@@ -12,7 +12,7 @@ use crate::pages::page_not_found::PageNotFound;
 use crate::pages::post::Post;
 use crate::pages::post_list::PostList;
 
-#[derive(Routable, PartialEq, Clone, Debug)]
+#[derive(Routable, PartialEq, Eq, Clone, Debug)]
 pub enum Route {
     #[at("/posts/:id")]
     Post { id: u32 },
@@ -52,7 +52,7 @@ pub fn App() -> Html {
     }
 }
 
-#[derive(Properties, PartialEq, Debug)]
+#[derive(Properties, PartialEq, Eq, Debug)]
 pub struct ServerAppProps {
     pub url: AttrValue,
     pub queries: HashMap<String, String>,

diff --git a/examples/function_router/src/components/author_card.rs b/examples/function_router/src/components/author_card.rs
@@ -7,12 +7,12 @@ use crate::content::Author;
 use crate::generator::Generated;
 use crate::Route;
 
-#[derive(Clone, Debug, PartialEq, Properties)]
+#[derive(Clone, Debug, PartialEq, Eq, Properties)]
 pub struct Props {
     pub seed: u32,
 }
 
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Eq, Debug)]
 pub struct AuthorState {
     pub inner: Author,
 }

diff --git a/examples/function_router/src/components/pagination.rs b/examples/function_router/src/components/pagination.rs
@@ -8,12 +8,12 @@ use crate::Route;
 
 const ELLIPSIS: &str = "\u{02026}";
 
-#[derive(Serialize, Deserialize, PartialEq, Clone, Debug)]
+#[derive(Serialize, Deserialize, PartialEq, Eq, Clone, Debug)]
 pub struct PageQuery {
     pub page: u32,
 }
 
-#[derive(Clone, Debug, PartialEq, Properties)]
+#[derive(Clone, Debug, PartialEq, Eq, Properties)]
 pub struct Props {
     pub page: u32,
     pub total_pages: u32,
@@ -50,7 +50,7 @@ pub fn RelNavButtons(props: &Props) -> Html {
     }
 }
 
-#[derive(Properties, Clone, Debug, PartialEq)]
+#[derive(Properties, Clone, Debug, PartialEq, Eq)]
 pub struct RenderLinksProps {
     range: Range<u32>,
     len: usize,
@@ -88,7 +88,7 @@ pub fn RenderLinks(props: &RenderLinksProps) -> Html {
     }
 }
 
-#[derive(Properties, Clone, Debug, PartialEq)]
+#[derive(Properties, Clone, Debug, PartialEq, Eq)]
 pub struct RenderLinkProps {
     to_page: u32,
     props: Props,

diff --git a/examples/function_router/src/components/post_card.rs b/examples/function_router/src/components/post_card.rs
@@ -7,12 +7,12 @@ use crate::content::PostMeta;
 use crate::generator::Generated;
 use crate::Route;
 
-#[derive(Clone, Debug, PartialEq, Properties)]
+#[derive(Clone, Debug, PartialEq, Eq, Properties)]
 pub struct Props {
     pub seed: u32,
 }
 
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Eq, Debug)]
 pub struct PostMetaState {
     inner: PostMeta,
 }

diff --git a/examples/function_router/src/pages/post.rs b/examples/function_router/src/pages/post.rs
@@ -12,7 +12,7 @@ pub struct Props {
     pub seed: u32,
 }
 
-#[derive(PartialEq, Debug)]
+#[derive(PartialEq, Eq, Debug)]
 pub struct PostState {
     pub inner: content::Post,
 }

diff --git a/examples/function_todomvc/src/state.rs b/examples/function_todomvc/src/state.rs
@@ -4,20 +4,20 @@ use serde::{Deserialize, Serialize};
 use strum_macros::{Display, EnumIter};
 use yew::prelude::*;
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub struct State {
     pub entries: Vec<Entry>,
     pub filter: Filter,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub struct Entry {
     pub id: usize,
     pub description: String,
     pub completed: bool,
 }
 
-#[derive(Clone, Copy, Debug, EnumIter, Display, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Copy, Debug, EnumIter, Display, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Filter {
     All,
     Active,

diff --git a/examples/game_of_life/src/cell.rs b/examples/game_of_life/src/cell.rs
@@ -1,4 +1,4 @@
-#[derive(Clone, Copy, PartialEq)]
+#[derive(Clone, Copy, PartialEq, Eq)]
 pub enum State {
     Alive,
     Dead,

diff --git a/examples/password_strength/src/password.rs b/examples/password_strength/src/password.rs
@@ -2,13 +2,13 @@ const PASSWORD_LEN: i32 = 17;
 
 pub fn generate_password() -> String {
     let mut space: Vec<char> = vec![];
-    for c in 'a'..'z' {
+    for c in 'a'..='z' {
         space.push(c);
     }
-    for c in 'A'..'Z' {
+    for c in 'A'..='Z' {
         space.push(c);
     }
-    for c in '0'..'9' {
+    for c in '0'..='9' {
         space.push(c);
     }
     space.extend(

diff --git a/examples/router/src/components/author_card.rs b/examples/router/src/components/author_card.rs
@@ -5,7 +5,7 @@ use crate::content::Author;
 use crate::generator::Generated;
 use crate::Route;
 
-#[derive(Clone, Debug, PartialEq, Properties)]
+#[derive(Clone, Debug, PartialEq, Eq, Properties)]
 pub struct Props {
     pub seed: u64,
 }

diff --git a/examples/router/src/components/pagination.rs b/examples/router/src/components/pagination.rs
@@ -6,12 +6,12 @@ use crate::Route;
 
 const ELLIPSIS: &str = "\u{02026}";
 
-#[derive(Serialize, Deserialize, PartialEq, Clone, Debug)]
+#[derive(Serialize, Deserialize, PartialEq, Eq, Clone, Debug)]
 pub struct PageQuery {
     pub page: u64,
 }
 
-#[derive(Clone, Debug, PartialEq, Properties)]
+#[derive(Clone, Debug, PartialEq, Eq, Properties)]
 pub struct Props {
     pub page: u64,
     pub total_pages: u64,

diff --git a/examples/router/src/components/post_card.rs b/examples/router/src/components/post_card.rs
@@ -5,7 +5,7 @@ use crate::content::PostMeta;
 use crate::generator::Generated;
 use crate::Route;
 
-#[derive(Clone, Debug, PartialEq, Properties)]
+#[derive(Clone, Debug, PartialEq, Eq, Properties)]
 pub struct Props {
     pub seed: u64,
 }

diff --git a/examples/router/src/main.rs b/examples/router/src/main.rs
@@ -13,7 +13,7 @@ use pages::post::Post;
 use pages::post_list::PostList;
 use yew::html::Scope;
 
-#[derive(Routable, PartialEq, Clone, Debug)]
+#[derive(Routable, PartialEq, Eq, Clone, Debug)]
 pub enum Route {
     #[at("/posts/:id")]
     Post { id: u64 },