From ddc176ea897d0fb31ecbf58cdd4c166ffff12d8d Mon Sep 17 00:00:00 2001
From: Ashley Wulber <48420062+wash2@users.noreply.github.com>
Date: Wed, 7 Jun 2023 15:46:01 -0400
Subject: [PATCH] Fix build jammy (#44)

* fix: use rust-all

* update deps

* remove rust-all version requirement

* fix: install 1.69.0 in ci.yml

* clippy
---
 .github/workflows/ci.yml               | 4 ++--
 Cargo.lock                             | 4 ++--
 app/src/pages/desktop/panel/applets.rs | 8 ++++----
 app/src/pages/desktop/wallpaper.rs     | 2 +-
 debian/control                         | 3 +--
 rust-toolchain                         | 2 +-
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ca99924..da1a48f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: install toolchain
-        run: rustup toolchain install stable --component rustfmt
+        run: rustup toolchain install 1.69.0 --component rustfmt
       - name: fmt
         run: cargo fmt --all --check
 
@@ -24,7 +24,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install lld cmake libexpat1-dev libfontconfig-dev libfreetype-dev pkg-config libxkbcommon-dev
       - uses: actions/checkout@v3
       - name: install toolchain
-        run: rustup show
+        run: rustup toolchain install 1.69.0 --component clippy
       - name: clippy
         run: cargo clippy --all-features
 
diff --git a/Cargo.lock b/Cargo.lock
index 40d9bc4..cc9c75e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4290,9 +4290,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.29.0"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02f1dc6930a439cc5d154221b5387d153f8183529b07c19aca24ea31e0a167e1"
+checksum = "c72130613601f6aad275f8bb9a1d4bf953df8e9c7891029f30e5fdc405ad07c4"
 dependencies = [
  "cfg-if",
  "core-foundation-sys",
diff --git a/app/src/pages/desktop/panel/applets.rs b/app/src/pages/desktop/panel/applets.rs
index 6064c7d..7ce505d 100644
--- a/app/src/pages/desktop/panel/applets.rs
+++ b/app/src/pages/desktop/panel/applets.rs
@@ -224,10 +224,10 @@ impl Page {
             has_some = true;
             list_column = list_column.add(
                 row![
-                    icon(info.icon.to_owned(), 32).style(theme::Svg::Symbolic),
+                    icon(info.icon.clone(), 32).style(theme::Svg::Symbolic),
                     column![
-                        text(info.name.to_owned()),
-                        text(info.description.to_owned()).size(10)
+                        text(info.name.clone()),
+                        text(info.description.clone()).size(10)
                     ]
                     .spacing(4.0)
                     .width(Length::Fill),
@@ -906,7 +906,7 @@ where
         );
     }
 
-    #[allow(clippy::too_many_lines)]
+    #[allow(clippy::too_many_lines, clippy::needless_match)]
     fn on_event(
         &mut self,
         tree: &mut Tree,
diff --git a/app/src/pages/desktop/wallpaper.rs b/app/src/pages/desktop/wallpaper.rs
index 90d7d2a..ecd15de 100644
--- a/app/src/pages/desktop/wallpaper.rs
+++ b/app/src/pages/desktop/wallpaper.rs
@@ -334,7 +334,7 @@ pub fn settings() -> Section<crate::pages::Message> {
 
             let background_fit = cosmic::iced::widget::pick_list(
                 &page.fit_options,
-                page.fit_options.get(page.selected_fit as usize).cloned(),
+                page.fit_options.get(page.selected_fit).cloned(),
                 Message::Fit,
             );
 
diff --git a/debian/control b/debian/control
index af3f80f..c47b4e9 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Michael Murphy <mmstick@pm.me>
 Build-Depends:
     debhelper-compat (=13),
     just (>= 1.13.0),
-    cargo,
+    rust-all,
     cmake,
     libexpat1-dev,
     libfontconfig-dev,
@@ -13,7 +13,6 @@ Build-Depends:
     lld,
     pkg-config,
     libxkbcommon-dev,
-    rustc (>= 1.65.0)
 Standards-Version: 4.6.2
 Homepage: https://github.com/pop-os/cosmic-settings
 
diff --git a/rust-toolchain b/rust-toolchain
index 870bbe4..cb90852 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-stable
\ No newline at end of file
+1.69.0
\ No newline at end of file