Fix Clippy for 1.63 (#2825)

This commit is contained in:
Kaede Hoshikawa 2022-08-12 22:16:05 +09:00 committed by GitHub
parent f640fc7c18
commit 989d804947
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 109 additions and 81 deletions

54
examples/Cargo.lock generated
View File

@ -1157,9 +1157,9 @@ checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
[[package]]
name = "js-sys"
version = "0.3.58"
version = "0.3.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
dependencies = [
"wasm-bindgen",
]
@ -2270,21 +2270,33 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]]
name = "tracing"
version = "0.1.35"
version = "0.1.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
dependencies = [
"cfg-if",
"log",
"pin-project-lite",
"tracing-attributes",
"tracing-core",
]
[[package]]
name = "tracing-core"
version = "0.1.28"
name = "tracing-attributes"
version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7"
checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "tracing-core"
version = "0.1.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
dependencies = [
"once_cell",
]
@ -2466,9 +2478,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
version = "0.2.81"
version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
dependencies = [
"cfg-if",
"serde",
@ -2478,13 +2490,13 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.81"
version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
dependencies = [
"bumpalo",
"lazy_static",
"log",
"once_cell",
"proc-macro2",
"quote",
"syn",
@ -2505,9 +2517,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.81"
version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@ -2515,9 +2527,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.81"
version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
dependencies = [
"proc-macro2",
"quote",
@ -2528,9 +2540,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.81"
version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
[[package]]
name = "wasm-logger"
@ -2545,9 +2557,9 @@ dependencies = [
[[package]]
name = "web-sys"
version = "0.3.58"
version = "0.3.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90"
checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1"
dependencies = [
"js-sys",
"wasm-bindgen",
@ -2668,6 +2680,7 @@ dependencies = [
"tokio",
"tokio-stream",
"tokio-util 0.7.3",
"tracing",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
@ -2704,6 +2717,7 @@ dependencies = [
"route-recognizer",
"serde",
"serde_urlencoded",
"tracing",
"wasm-bindgen",
"web-sys",
"yew",

View File

@ -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,
}

View File

@ -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,

View File

@ -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,
}

View File

@ -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,
}

View File

@ -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,

View File

@ -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,

View File

@ -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>,

View File

@ -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,
}

View File

@ -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,

View File

@ -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,
}

View File

@ -12,7 +12,7 @@ pub struct Props {
pub seed: u32,
}
#[derive(PartialEq, Debug)]
#[derive(PartialEq, Eq, Debug)]
pub struct PostState {
pub inner: content::Post,
}

View File

@ -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,

View File

@ -1,4 +1,4 @@
#[derive(Clone, Copy, PartialEq)]
#[derive(Clone, Copy, PartialEq, Eq)]
pub enum State {
Alive,
Dead,

View File

@ -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(

View File

@ -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,
}

View File

@ -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,

View File

@ -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,
}

View File

@ -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 },

View File

@ -117,7 +117,7 @@ pub struct Entry {
pub editing: bool,
}
#[derive(Clone, Copy, Debug, EnumIter, Display, PartialEq, Serialize, Deserialize)]
#[derive(Clone, Copy, Debug, EnumIter, Display, PartialEq, Serialize, Deserialize, Eq)]
pub enum Filter {
All,
Active,

View File

@ -12,7 +12,7 @@ use syn::{LitStr, Token};
use crate::stringify::Stringify;
use crate::{non_capitalized_ascii, Peek};
#[derive(Clone, PartialEq)]
#[derive(Clone, PartialEq, Eq)]
pub struct HtmlDashedName {
pub name: Ident,
pub extended: Vec<(Token![-], Ident)>,

View File

@ -5,7 +5,7 @@ use crate::hooks::use_navigator;
use crate::Routable;
/// Props for [`Redirect`]
#[derive(Properties, Clone, PartialEq)]
#[derive(Properties, Clone, PartialEq, Eq)]
pub struct RedirectProps<R: Routable> {
/// Route that will be pushed when the component is rendered.
pub to: R,

View File

@ -9,7 +9,7 @@ pub type NavigationError = HistoryError;
pub type NavigationResult<T> = HistoryResult<T>;
/// The kind of Navigator Provider.
#[derive(Debug, PartialEq, Clone, Copy)]
#[derive(Debug, PartialEq, Eq, Clone, Copy)]
pub enum NavigatorKind {
/// Browser History.
Browser,

View File

@ -34,7 +34,7 @@ pub trait Routable: Clone + PartialEq {
///
/// This can be used with [`History`](gloo::history::History) and
/// [`Location`](gloo::history::Location) when the type of [`Routable`] is unknown.
#[derive(Debug, Clone, PartialEq)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct AnyRoute {
path: String,
}

View File

@ -237,7 +237,7 @@ impl Apply for Attributes {
}
// For VTag's constructed outside the html! macro
(Self::IndexMap(new), Self::IndexMap(ref old)) => {
Self::apply_diff_index_maps(el, &*new, &*old);
Self::apply_diff_index_maps(el, new, old);
}
// Cold path. Happens only with conditional swapping and reordering of `VTag`s with the
// same tag and no keys.

View File

@ -93,7 +93,7 @@ mod __macro {
pub struct AssertAllProps;
/// Builder for when a component has no properties
#[derive(Debug, PartialEq)]
#[derive(Debug, PartialEq, Eq)]
pub struct EmptyBuilder;
impl super::Properties for () {

View File

@ -19,7 +19,7 @@ impl<O> Deref for UseFutureHandle<O> {
type Target = O;
fn deref(&self) -> &Self::Target {
&*self.inner.as_ref().unwrap()
self.inner.as_ref().unwrap()
}
}

54
tools/Cargo.lock generated
View File

@ -909,9 +909,9 @@ dependencies = [
[[package]]
name = "js-sys"
version = "0.3.58"
version = "0.3.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
dependencies = [
"wasm-bindgen",
]
@ -1779,20 +1779,32 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]]
name = "tracing"
version = "0.1.35"
version = "0.1.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
dependencies = [
"cfg-if",
"pin-project-lite",
"tracing-attributes",
"tracing-core",
]
[[package]]
name = "tracing-core"
version = "0.1.28"
name = "tracing-attributes"
version = "0.1.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7"
checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "tracing-core"
version = "0.1.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
dependencies = [
"once_cell",
]
@ -1884,9 +1896,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
[[package]]
name = "wasm-bindgen"
version = "0.2.81"
version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
dependencies = [
"cfg-if",
"serde",
@ -1896,13 +1908,13 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.81"
version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
dependencies = [
"bumpalo",
"lazy_static",
"log",
"once_cell",
"proc-macro2",
"quote",
"syn",
@ -1923,9 +1935,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.81"
version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@ -1933,9 +1945,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.81"
version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
dependencies = [
"proc-macro2",
"quote",
@ -1946,9 +1958,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.81"
version = "0.2.82"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
[[package]]
name = "wasm-logger"
@ -1963,9 +1975,9 @@ dependencies = [
[[package]]
name = "web-sys"
version = "0.3.58"
version = "0.3.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90"
checksum = "ed055ab27f941423197eb86b2035720b1a3ce40504df082cac2ecc6ed73335a1"
dependencies = [
"js-sys",
"wasm-bindgen",
@ -2116,6 +2128,7 @@ dependencies = [
"tokio",
"tokio-stream",
"tokio-util",
"tracing",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
@ -2185,6 +2198,7 @@ dependencies = [
"route-recognizer",
"serde",
"serde_urlencoded",
"tracing",
"wasm-bindgen",
"web-sys",
"yew 0.19.3",

View File

@ -1,4 +1,4 @@
#[derive(Clone, PartialEq)]
#[derive(Clone, PartialEq, Eq)]
pub struct Video {
pub id: usize,
pub title: String,