chore: clippy lint on CI

dataspace-rs · Sep 21, 2024 · 0e26b30 · 0e26b30
1 parent fcb85c4
commit 0e26b30
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 12 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,7 +18,6 @@ jobs:
         os: [ubuntu-latest]
         rust: [stable]
     steps:
-
       - uses: actions/checkout@v2
       - name: Starting EDC Servers
         run: |
@@ -38,8 +37,15 @@ jobs:
         with:
           command: fmt
           args: --all -- --check
+
+      - name: Run cargo clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --all -- -D warnings
+
       - name: Run cargo test with tokio
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --manifest-path edc-connector-client/Cargo.toml  
+          args: --manifest-path edc-connector-client/Cargo.toml
diff --git a/edc-connector-tui/src/app.rs b/edc-connector-tui/src/app.rs
@@ -253,7 +253,7 @@ impl Component for App {
         &mut self,
         msg: ComponentMsg<Self::Msg>,
     ) -> anyhow::Result<ComponentReturn<AppMsg>> {
-        match msg.to_owned() {
+        match msg.take() {
             AppMsg::ConnectorsMsg(m) => {
                 Self::forward_update::<_, ConnectorsComponent>(
                     &mut self.connectors,

diff --git a/edc-connector-tui/src/components.rs b/edc-connector-tui/src/components.rs
@@ -190,7 +190,8 @@ pub enum NotificationKind {
 }
 
 impl<T> ComponentMsg<T> {
-    pub fn to_owned(self) -> T {
+
+    pub fn take(self) -> T {
         self.0
     }
 

diff --git a/edc-connector-tui/src/components/connectors.rs b/edc-connector-tui/src/components/connectors.rs
@@ -50,7 +50,7 @@ impl Component for ConnectorsComponent {
         &mut self,
         msg: ComponentMsg<Self::Msg>,
     ) -> anyhow::Result<ComponentReturn<Self::Msg>> {
-        match msg.to_owned() {
+        match msg.take() {
             ConnectorsMsg::ConnectorSelected(connector) => {
                 self.selected = Some(connector.clone());
                 Ok(ComponentReturn::action(Action::NavTo(Nav::AssetsList)))

diff --git a/edc-connector-tui/src/components/header.rs b/edc-connector-tui/src/components/header.rs
@@ -71,7 +71,7 @@ impl Component for HeaderComponent {
         &mut self,
         msg: ComponentMsg<Self::Msg>,
     ) -> anyhow::Result<ComponentReturn<Self::Msg>> {
-        match msg.to_owned() {
+        match msg.take() {
             HeaderMsg::NextTab => {
                 let current = self.menu.clone();
                 let idx = (self.menu.ordinal() + 1) % Menu::VALUES.len();

diff --git a/edc-connector-tui/src/components/launch_bar.rs b/edc-connector-tui/src/components/launch_bar.rs
@@ -41,7 +41,7 @@ impl Component for LaunchBar {
         &mut self,
         msg: ComponentMsg<Self::Msg>,
     ) -> anyhow::Result<ComponentReturn<Self::Msg>> {
-        match msg.to_owned() {
+        match msg.take() {
             LaunchBarMsg::AppendCommand(input) => {
                 self.area.input(input);
                 Ok(ComponentReturn::empty())

diff --git a/edc-connector-tui/src/components/resources.rs b/edc-connector-tui/src/components/resources.rs
@@ -109,7 +109,7 @@ impl<T: DrawableResource + TableEntry + Send + Sync> Component for ResourcesComp
         &mut self,
         msg: ComponentMsg<Self::Msg>,
     ) -> anyhow::Result<ComponentReturn<Self::Msg>> {
-        match msg.to_owned() {
+        match msg.take() {
             ResourcesMsg::ResourceSelected(selected) => {
                 self.resource.update_resource(Some(selected));
                 self.focus = Focus::Resource;

diff --git a/edc-connector-tui/src/components/resources/resource.rs b/edc-connector-tui/src/components/resources/resource.rs
@@ -159,7 +159,7 @@ impl<T: DrawableResource + Send> Component for ResourceComponent<T> {
         &mut self,
         message: ComponentMsg<Self::Msg>,
     ) -> anyhow::Result<ComponentReturn<Self::Msg>> {
-        match message.to_owned() {
+        match message.take() {
             ResourceMsg::MoveUp => self.move_up(),
             ResourceMsg::MoveDown => self.move_down(),
             ResourceMsg::Yank => self.yank(),

diff --git a/edc-connector-tui/src/components/table.rs b/edc-connector-tui/src/components/table.rs
@@ -16,11 +16,13 @@ use self::msg::{TableLocalMsg, TableMsg};
 
 use super::{Component, ComponentEvent, ComponentMsg, ComponentReturn};
 
+pub type OnSelect<T, M> = Box<dyn Fn(&T) -> M + Send + Sync>;
+
 pub struct UiTable<T: TableEntry, M> {
     name: String,
     pub elements: Vec<T>,
     table_state: TableState,
-    on_select: Option<Box<dyn Fn(&T) -> M + Send + Sync>>,
+    on_select: Option<OnSelect<T, M>>,
 }
 
 impl<T: TableEntry + Debug, M> Debug for UiTable<T, M> {
@@ -79,7 +81,7 @@ impl<T: TableEntry + Send, M: Send> Component for UiTable<T, M> {
         &mut self,
         msg: ComponentMsg<Self::Msg>,
     ) -> anyhow::Result<ComponentReturn<Self::Msg>> {
-        match msg.to_owned() {
+        match msg.take() {
             TableMsg::Local(TableLocalMsg::MoveDown) => self.move_down(),
             TableMsg::Local(TableLocalMsg::MoveUp) => self.move_up(),
             TableMsg::Outer(_) => {}
@@ -151,7 +153,7 @@ impl<T: TableEntry, M> UiTable<T, M> {
 
     fn move_up(&mut self) {
         let new_pos = match self.table_state.selected() {
-            Some(i) if i == 0 => self.elements.len() - 1,
+            Some(0) => self.elements.len() - 1,
             Some(i) => i - 1,
             None => 0,
         };