174 Use Clippy CLI instead of github Action

.github/workflows/build.yml

@@ -131,10 +131,9 @@ jobs:
       - name: Cargo build
         run: cargo build --verbose --locked --release
         working-directory: ${{ env.SOURCE_PATH }}
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-features --workspace --all-targets --manifest-path "${{ env.SOURCE_PATH }}/Cargo.toml"
+      - name: Clippy
+        run: cargo clippy --all-features --workspace --all-targets -- -D warnings
+        working-directory: ${{ env.SOURCE_PATH }}
       - name: Run tests
         run: cargo test --verbose --locked --release --no-fail-fast
         working-directory: ${{ env.SOURCE_PATH }}

cube_shuffle-cli/src/output.rs

@@ -15,7 +15,7 @@ pub fn to_string<O>(format: Formats, output_data: O) -> String
 where
     O: Debug + Serialize,
 {
-    return match format {
+    match format {
         Formats::Debug => {
             format!("{:?}", output_data)
         }
@@ -24,5 +24,5 @@ where
         }
         Formats::Json => serde_json::to_string(&output_data).unwrap(),
         Formats::Yaml => serde_yaml::to_string(&output_data).unwrap(),
-    };
+    }
 }

cube_shuffle-core/src/distribution_shuffle.rs

@@ -17,15 +17,15 @@ pub struct Pile {
     pub randomness: Odds,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub struct Pack<P>
 where
     P: Hash + Eq + Serialize,
 {
     pub card_sources: HashMap<P, usize>,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
 pub enum ShufflingErrors {
     EmptyPacks,
     CardOverflow {

cube_shuffle-wasm/src/components/add_pile.rs

@@ -76,7 +76,7 @@ impl Component for AddPile {
         let update_cards = ctx.link().callback(Msg::UpdateCards);
         let update_randomness = ctx.link().callback(Msg::UpdateRandomness);
         let submit = ctx.link().callback(|_| Msg::Add);
-        return html! {
+        html! {
             <>
                 <div class="field">
                     <label class="label">{ "Pile name" }</label>
@@ -118,6 +118,6 @@ impl Component for AddPile {
                     </div>
                 </div>
             </>
-        };
+        }
     }
 }

cube_shuffle-wasm/src/components/app.rs

@@ -26,7 +26,7 @@ pub enum Msg {
     Error(Option<String>),
 }
 
-#[derive(Clone, PartialEq)]
+#[derive(Clone, PartialEq, Eq)]
 pub enum State {
     Piling,
     Shuffled { packs: Vec<Pack<String>> },
@@ -224,15 +224,15 @@ impl Component for App {
 
         let clear_error = link.callback(|_| Msg::Error(None));
         let error_html: Html = self.error_message.clone().map_or(html! {}, |e| {
-            return html! {
+            html! {
                 <div class="notification is-danger">
                     <button onclick={ clear_error } class="delete"></button>
                     <p>{ e }</p>
                 </div>
-            };
+            }
         });
 
-        return html! {
+        html! {
             <>
                 <section class="section has-background-black-ter">
                     <div class="container">
@@ -249,7 +249,7 @@ impl Component for App {
                 { error_html }
                 { content }
             </>
-        };
+        }
     }
 }
 

cube_shuffle-wasm/src/components/pack_card.rs

@@ -69,7 +69,7 @@ impl Component for PackCard {
             }
         };
 
-        return html! {
+        html! {
             <div class="card">
                 <div class={ "card-header".to_owned() + checked_bg }>
                     <label class="label card-header-title">{ props.index + 1 }</label>
@@ -85,6 +85,6 @@ impl Component for PackCard {
                     </table>
                 </div>
             </div>
-        };
+        }
     }
 }

cube_shuffle-wasm/src/components/pack_list.rs

@@ -5,7 +5,7 @@ use cube_shuffle_core::distribution_shuffle::Pack;
 
 use crate::components::pack_card::PackCard;
 
-#[derive(Clone, PartialEq, Properties)]
+#[derive(Clone, PartialEq, Eq, Properties)]
 pub struct Props {
     pub packs: Vec<Pack<String>>,
 }
@@ -70,10 +70,10 @@ impl Component for PackList {
                 }
             })
             .collect();
-        return html! {
+        html! {
             <div class="columns is-multiline is-centered">
                 { packs }
             </div>
-        };
+        }
     }
 }

cube_shuffle-wasm/src/components/pile_card.rs

@@ -38,7 +38,7 @@ impl Component for PileCard {
         let delete = ctx.link().callback(|_| Msg::Delete);
         let pile = props.pile;
         let randomness = pile.randomness * 100.0;
-        return html! {
+        html! {
             <article class="message is-medium">
                 <div class="message-header">
                     <label>{ props.name.clone() }</label>
@@ -59,6 +59,6 @@ impl Component for PileCard {
                     </table>
                 </div>
             </article>
-        };
+        }
     }
 }

cube_shuffle-wasm/src/components/pile_list.rs

@@ -16,21 +16,21 @@ pub fn pile_card(props: &Props) -> Html {
         .piles
         .iter()
         .map(|(name, pile)| {
-            return html! {
+            html! {
                 <div class="column is-narrow">
                     <PileCard
                         name={ name.clone() }
                         pile={ *pile }
                         delete={ &props.delete_pile }
                     />
                 </div>
-            };
+            }
         })
         .collect();
 
-    return html! {
+    html! {
         <div class="columns is-multiline is-centered">
             { cards }
         </div>
-    };
+    }
 }