From e859c777a403f376c317cd2b66dab7b16d886ede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mikrut?= Date: Sun, 22 Oct 2023 13:07:38 +0200 Subject: [PATCH] Delete --- .github/workflows/quality.yml | 10 +++------- czkawka_slint_gui/.clippy.toml | 0 czkawka_slint_gui/src/connect_delete.rs | 2 +- czkawka_slint_gui/src/connect_open.rs | 2 -- czkawka_slint_gui/src/main.rs | 7 ++++--- 5 files changed, 8 insertions(+), 13 deletions(-) create mode 100644 czkawka_slint_gui/.clippy.toml diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index a7c0459..b28b53f 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -20,11 +20,7 @@ jobs: - name: Check the format run: cargo fmt --all -- --check - # type complexity must be ignored because we use huge templates for queries + # Clippy overly_complex_bool_expr is disabled because mess with generated files in target dir + # and I cannot disable it - name: Run clippy - run: > - cargo clippy - --all-targets - --all-features - -- - -D warnings + run: cargo clippy --all-targets --all-features -- -A clippy::overly_complex_bool_expr -D warnings diff --git a/czkawka_slint_gui/.clippy.toml b/czkawka_slint_gui/.clippy.toml new file mode 100644 index 0000000..e69de29 diff --git a/czkawka_slint_gui/src/connect_delete.rs b/czkawka_slint_gui/src/connect_delete.rs index 953e570..648f6a5 100644 --- a/czkawka_slint_gui/src/connect_delete.rs +++ b/czkawka_slint_gui/src/connect_delete.rs @@ -20,7 +20,7 @@ pub fn connect_delete_button(app: &MainWindow) { *selected_row = false; }); let r = ModelRc::new(VecModel::from(entries_left)); - app.set_empty_folder_model(r.into()); + app.set_empty_folder_model(r); } }); } diff --git a/czkawka_slint_gui/src/connect_open.rs b/czkawka_slint_gui/src/connect_open.rs index 7316790..cfd56fc 100644 --- a/czkawka_slint_gui/src/connect_open.rs +++ b/czkawka_slint_gui/src/connect_open.rs @@ -1,6 +1,4 @@ use crate::MainWindow; -use slint::{ComponentHandle, Model, ModelRc, SharedString, VecModel}; -use std::borrow::BorrowMut; pub fn connect_open_items(app: &MainWindow) { app.on_item_opened(move |path| { diff --git a/czkawka_slint_gui/src/main.rs b/czkawka_slint_gui/src/main.rs index 9c857a1..8422ef0 100644 --- a/czkawka_slint_gui/src/main.rs +++ b/czkawka_slint_gui/src/main.rs @@ -24,15 +24,16 @@ fn main() { app.run().unwrap(); } +type ModelType = VecModel<(bool, bool, bool, ModelRc)>; // TODO remove this after trying pub fn to_remove_debug(app: &MainWindow) { - let row_data: Rc)>> = Rc::new(VecModel::default()); + let row_data: Rc = Rc::new(VecModel::default()); - for r in 0..100000 { + for r in 0..100_000 { let items = VecModel::default(); for c in 0..3 { - items.push(slint::format!("Item {r}.{c}").into()); + items.push(slint::format!("Item {r}.{c}")); } row_data.push((r % 2 == 0, r % 3 == 0, false, ModelRc::new(items)));