From 9d2f2f68d040e634bb414415a568f4fb39db8875 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Fri, 19 Jan 2024 03:35:33 -0800 Subject: [PATCH] Update dependencies --- Cargo.lock | 81 +++++++++++++++++++++++++++-------------------------- src/main.rs | 20 ++++++------- 2 files changed, 50 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7403e9b..4ecbae1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,9 +106,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628a8f9bd1e24b4e0db2b4bc2d000b001e7dd032d54afa60a68836aeec5aa54a" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -791,7 +791,7 @@ dependencies = [ [[package]] name = "cosmic-comp-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-comp#44bf1c316f3ca417c76fb45ec3f5e7efb6388e25" +source = "git+https://github.com/pop-os/cosmic-comp#e569e14a99c6471dd7b9536d795448f2a8c8c948" dependencies = [ "cosmic-config", "input", @@ -801,7 +801,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -816,7 +816,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "quote", "syn 1.0.109", @@ -838,7 +838,7 @@ dependencies = [ [[package]] name = "cosmic-text" version = "0.10.0" -source = "git+https://github.com/pop-os/cosmic-text.git?branch=refactor#dd4c4cbbe2d5ed5046054b5361a6eeead50e0bb0" +source = "git+https://github.com/pop-os/cosmic-text.git#6aadfaddac7ae68c3f97c0b9b2fa75033374a650" dependencies = [ "bitflags 2.4.2", "fontdb", @@ -850,6 +850,7 @@ dependencies = [ "self_cell 1.0.3", "swash", "sys-locale", + "ttf-parser", "unicode-bidi", "unicode-linebreak", "unicode-script", @@ -859,7 +860,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "almost", "cosmic-config", @@ -1297,9 +1298,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -1882,9 +1883,9 @@ checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" [[package]] name = "glow" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886c2a30b160c4c6fec8f987430c26b526b7988ca71f664e6a699ddf6f9601e4" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" dependencies = [ "js-sys", "slotmap", @@ -1903,8 +1904,8 @@ dependencies = [ [[package]] name = "glyphon" -version = "0.3.0" -source = "git+https://github.com/jackpot51/glyphon.git?branch=refactor#c28dc99c86b6b598633e6623096b21632f266976" +version = "0.4.1" +source = "git+https://github.com/jackpot51/glyphon.git#abb70c0fda8cf1a5dfc314c1c778103d7ba951e6" dependencies = [ "cosmic-text", "etagere", @@ -2033,9 +2034,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" [[package]] name = "hex" @@ -2128,7 +2129,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "iced_accessibility", "iced_core", @@ -2143,7 +2144,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "accesskit", "accesskit_unix", @@ -2152,7 +2153,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "bitflags 1.3.2", "iced_accessibility", @@ -2170,7 +2171,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "futures", "iced_core", @@ -2183,7 +2184,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2206,7 +2207,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2219,7 +2220,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "iced_accessibility", "iced_core", @@ -2231,7 +2232,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "enum-repr", "float-cmp", @@ -2255,7 +2256,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "iced_core", "once_cell", @@ -2265,7 +2266,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "bytemuck", "cosmic-text", @@ -2283,7 +2284,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2303,7 +2304,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "iced_renderer", "iced_runtime", @@ -2576,7 +2577,7 @@ checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#6a952e9350f3c10d21eb2ccbe0d206ff0498a069" +source = "git+https://github.com/pop-os/libcosmic#efe4ce2f5b514e4d553ab82c0c873dca7585c028" dependencies = [ "apply", "ashpd", @@ -2706,9 +2707,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" dependencies = [ "hashbrown 0.14.3", ] @@ -3528,9 +3529,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rayon" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -3538,9 +3539,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -3917,9 +3918,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" +checksum = "3b187f0231d56fe41bfb12034819dd2bf336422a5866de41bc3fec4b2e3883e8" [[package]] name = "smithay-client-toolkit" @@ -4422,9 +4423,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-bidi-mirroring" @@ -4461,9 +4462,9 @@ dependencies = [ [[package]] name = "unicode-properties" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f91c8b21fbbaa18853c3d0801c78f4fc94cdb976699bb03e832e75f7fd22f0" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" [[package]] name = "unicode-script" diff --git a/src/main.rs b/src/main.rs index ac024f0..cd02347 100644 --- a/src/main.rs +++ b/src/main.rs @@ -40,8 +40,8 @@ use cosmic::{ iced_sctk::commands::layer_surface::{destroy_layer_surface, get_layer_surface}, }; use cosmic_comp_config::{workspace::WorkspaceAmount, CosmicCompConfig}; -use cosmic_config::{cosmic_config_derive::CosmicConfigEntry, CosmicConfigEntry}; use cosmic_config::ConfigSet; +use cosmic_config::{cosmic_config_derive::CosmicConfigEntry, CosmicConfigEntry}; use i18n_embed::DesktopLanguageRequester; use once_cell::sync::Lazy; use std::{ @@ -647,24 +647,22 @@ impl Application for App { "com.system76.CosmicWorkspaces".into(), 1, ) - .map(|(_, res)| match res { - Ok(c) => Msg::Config(c), - Err((errs, c)) => { - log::error!("Failed to load workspaces config: {:?}", errs); - Msg::Config(c) + .map(|update| { + if !update.errors.is_empty() { + log::error!("Failed to load workspaces config: {:?}", update.errors); } + Msg::Config(update.config) }); let comp_config_subscription = cosmic_config::config_subscription::<_, CosmicCompConfig>( "comp-config-sub", "com.system76.CosmicComp".into(), 1, ) - .map(|(_, res)| match res { - Ok(c) => Msg::CompConfig(c), - Err((errs, c)) => { - log::error!("Failed to load compositor config: {:?}", errs); - Msg::CompConfig(c) + .map(|update| { + if !update.errors.is_empty() { + log::error!("Failed to load compositor config: {:?}", update.errors); } + Msg::CompConfig(update.config) }); let mut subscriptions = vec![events, config_subscription, comp_config_subscription]; if let Some(conn) = self.conn.clone() {