From 4b38bdf3988e0a841c51eb5272d3602206590ce1 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Sat, 19 Sep 2026 10:51:35 +0200 Subject: [PATCH 1/6] i18n: translation updates from weblate Co-authored-by: therealmate Translate-URL: https://hosted.weblate.org/projects/pop-os/cosmic-edit/hu/ Translation: Pop OS/COSMIC Edit --- i18n/hu/cosmic_edit.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/hu/cosmic_edit.ftl b/i18n/hu/cosmic_edit.ftl index 6660e16..5a8ba06 100644 --- a/i18n/hu/cosmic_edit.ftl +++ b/i18n/hu/cosmic_edit.ftl @@ -53,7 +53,7 @@ dark = Sötét light = Világos syntax-dark = Sötét szintaxis syntax-light = Világos szintaxis -default-font = Alapértelmezett betűtípus +default-font = Alapértelmezett betűkészlet default-font-size = Alapértelmezett betűméret default-zoom-step = Nagyítási mérték From 7baa24b649a2bc0abc16f007f984d0f5535ae31b Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 30 Sep 2026 09:55:31 -0600 Subject: [PATCH 2/6] COSMIC policy update Generated by cosmic-epoch scripts/policy-update.sh. Uses `policy_nobuild` branch to avoid package builds as it contains no code changes. --- .github/PULL_REQUEST_TEMPLATE.md | 16 +++++++++------- .github/workflows/require-checklist.yml | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/require-checklist.yml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e6ca28b..63abe52 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,8 +1,10 @@ -- [ ] I have disclosed use of any AI generated code in my commit messages. - - If you are using an LLM, and do not fully understand the changes it is making to the code base, do not create a PR. - - In our experience, AI generated code often results in overly complex code that lacks enough context for a proper fix or feature inclusion. This results in considerably longer code reviews. Due to this, AI authored or partially authored PRs may be closed without comment. -- [ ] I understand these changes in full and will be able to respond to review comments. -- [ ] My change is accurately described in the commit message. -- [ ] My contribution is tested and working as described. -- [ ] I have read the [Developer Certificate of Origin](https://developercertificate.org/) and certify my contribution under its conditions. +Replace this text with a description of your changes, and why these changes are important. Read and acknowledge the list below. PRs without a completed checkbox will be closed. +--- + +- I have not included any LLM (also known as AI) generated content in this PR, including code, comments, and descriptions. +- I understand these changes in full and will be able to respond to review comments. +- My change is accurately described in the commit message. +- My contribution is tested and working as described. +- I have read the [Developer Certificate of Origin](https://developercertificate.org/) and certify my contribution under its conditions. +- [ ] I have read and followed all of the above requirements. For more information, see our [contributor guide](https://github.com/pop-os/pop/blob/master/CONTRIBUTING.md). diff --git a/.github/workflows/require-checklist.yml b/.github/workflows/require-checklist.yml new file mode 100644 index 0000000..fd4ca8c --- /dev/null +++ b/.github/workflows/require-checklist.yml @@ -0,0 +1,14 @@ +# From https://github.com/mheap/require-checklist-action, license MIT +name: Require Checklist + +on: + pull_request: + types: [opened, edited, synchronize] + +jobs: + job1: + runs-on: ubuntu-latest + steps: + - uses: mheap/require-checklist-action@v2 + with: + requireChecklist: true From 690065d9a8b4bef4c5d109784e264c9baa86d898 Mon Sep 17 00:00:00 2001 From: Kartik <65574961+KodeBarista@users.noreply.github.com> Date: Thu, 1 Oct 2026 00:59:08 +0530 Subject: [PATCH 3/6] Add license url & update developers name to System76 (#635) - [X] I have disclosed use of any AI generated code in my commit messages. - If you are using an LLM, and do not fully understand the changes it is making to the code base, do not create a PR. - In our experience, AI generated code often results in overly complex code that lacks enough context for a proper fix or feature inclusion. This results in considerably longer code reviews. Due to this, AI authored or partially authored PRs may be closed without comment. - [X] I understand these changes in full and will be able to respond to review comments. - [X] My change is accurately described in the commit message. - [X] My contribution is tested and working as described. - [X] I have read the [Developer Certificate of Origin](https://developercertificate.org/) and certify my contribution under its conditions. --- src/main.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 0d00f81..3a08af8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1461,7 +1461,8 @@ impl Application for App { .author("System76") .comments(fl!("comment")) .license("GPL-3.0-only") - .developers([("Jeremy Soller", "jeremy@system76.com")]) + .license_url("https://spdx.org/licenses/GPL-3.0-only") + .developers([("System76", "info@system76.com")]) .links([ (fl!("repository"), "https://github.com/pop-os/cosmic-edit"), ( From d7b82fad91200ced66b693740e05e893f51713d2 Mon Sep 17 00:00:00 2001 From: Hojjat Date: Tue, 22 Sep 2026 17:32:57 -0600 Subject: [PATCH 4/6] chore: set up github actions for fmt, test, and clippy --- .github/workflows/ci.yml | 47 ++++++++++++++++++++++++++++++++++++++++ rust-toolchain.toml | 3 +++ 2 files changed, 50 insertions(+) create mode 100644 .github/workflows/ci.yml create mode 100644 rust-toolchain.toml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..4314fab --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,47 @@ +name: Continuous integration + +on: + push: + branches: [master] + pull_request: + +env: + CARGO_TERM_COLOR: always + DEBIAN_FRONTEND: noninteractive + +jobs: + fmt: + name: Rustfmt + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v5 + - name: install toolchain + run: rustup toolchain install nightly --component rustfmt + - name: fmt + run: cargo +nightly fmt --all --check + + clippy: + name: Clippy + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v5 + - name: install system dependencies + run: sudo apt-get update && sudo apt-get install -y pkg-config libglib2.0-dev libxkbcommon-dev libwayland-dev + - name: install toolchain + run: rustup show + - uses: Swatinem/rust-cache@v2 + - name: clippy + run: cargo clippy --all-features --all-targets -- -D warnings + + test: + name: Test + runs-on: ubuntu-24.04 + steps: + - uses: actions/checkout@v5 + - name: install system dependencies + run: sudo apt-get update && sudo apt-get install -y pkg-config libglib2.0-dev libxkbcommon-dev libwayland-dev + - name: install toolchain + run: rustup show + - uses: Swatinem/rust-cache@v2 + - name: test + run: cargo test --all-features diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..bbfabdb --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "1.93" +components = ["clippy", "rustfmt"] From 13987165088d991d3c024b5bbb8cd7eb89b4c2ad Mon Sep 17 00:00:00 2001 From: Hojjat Date: Tue, 22 Sep 2026 17:33:07 -0600 Subject: [PATCH 5/6] chore: clean up formatting and lint --- src/config.rs | 11 +-- src/git.rs | 2 +- src/main.rs | 247 +++++++++++++++++++++++------------------------- src/menu.rs | 10 +- src/project.rs | 16 ++-- src/search.rs | 8 +- src/tab.rs | 7 +- src/text_box.rs | 47 ++++----- 8 files changed, 164 insertions(+), 184 deletions(-) diff --git a/src/config.rs b/src/config.rs index c5cea7f..3eaaac0 100644 --- a/src/config.rs +++ b/src/config.rs @@ -112,17 +112,8 @@ impl Config { } } -#[derive(Clone, CosmicConfigEntry, Debug, Deserialize, Eq, PartialEq, Serialize)] +#[derive(Clone, CosmicConfigEntry, Debug, Deserialize, Eq, PartialEq, Serialize, Default)] pub struct ConfigState { pub recent_files: VecDeque, pub recent_projects: VecDeque, } - -impl Default for ConfigState { - fn default() -> Self { - Self { - recent_files: VecDeque::new(), - recent_projects: VecDeque::new(), - } - } -} diff --git a/src/git.rs b/src/git.rs index 02bf15a..c4855d6 100644 --- a/src/git.rs +++ b/src/git.rs @@ -124,7 +124,7 @@ impl GitRepository { msg.push_str("\nstderr> "); msg.push_str(line); } - Err(io::Error::new(io::ErrorKind::Other, msg)) + Err(io::Error::other(msg)) } } diff --git a/src/main.rs b/src/main.rs index 3a08af8..4b9cbba 100644 --- a/src/main.rs +++ b/src/main.rs @@ -328,6 +328,7 @@ impl PartialEq for WatcherWrapper { } } +#[allow(clippy::large_enum_variant)] enum NewTab { Tab(EditorTab), Exists(Entity), @@ -529,7 +530,7 @@ impl App { continue; } let entry_path = entry.path(); - let node = match ProjectNode::new(&entry_path) { + let node = match ProjectNode::new(entry_path) { Ok(ok) => ok, Err(err) => { log::error!( @@ -682,11 +683,11 @@ impl App { //TODO: allow files to be open multiple times let mut activate_opt = None; for entity in self.tab_model.iter() { - if let Some(Tab::Editor(tab)) = self.tab_model.data::(entity) { - if tab.path_opt.as_ref() == Some(&canonical) { - activate_opt = Some(entity); - break; - } + if let Some(Tab::Editor(tab)) = self.tab_model.data::(entity) + && tab.path_opt.as_ref() == Some(&canonical) + { + activate_opt = Some(entity); + break; } } if let Some(entity) = activate_opt { @@ -734,10 +735,10 @@ impl App { } let entities: Vec<_> = self.tab_model.iter().collect(); for entity in entities { - if self.tab_model.is_active(entity) { - if let Some(Tab::Editor(tab)) = self.tab_model.data_mut::(entity) { - tab.set_config(&self.config); - } + if self.tab_model.is_active(entity) + && let Some(Tab::Editor(tab)) = self.tab_model.data_mut::(entity) + { + tab.set_config(&self.config); } } } @@ -754,10 +755,10 @@ impl App { } fn save_config_state(&mut self) { - if let Some(ref config_state_handler) = self.config_state_handler { - if let Err(err) = self.config_state.write_entry(config_state_handler) { - log::error!("failed to save config_state: {}", err); - } + if let Some(ref config_state_handler) = self.config_state_handler + && let Err(err) = self.config_state.write_entry(config_state_handler) + { + log::error!("failed to save config_state: {}", err); } } @@ -777,10 +778,10 @@ impl App { Some(DialogPage::PromptSaveQuit(ref _entities)) => { let mut unsaved = Vec::new(); for entity in self.tab_model.iter() { - if let Some(Tab::Editor(tab)) = self.tab_model.data::(entity) { - if tab.changed() { - unsaved.push(entity); - } + if let Some(Tab::Editor(tab)) = self.tab_model.data::(entity) + && tab.changed() + { + unsaved.push(entity); } } if unsaved.is_empty() { @@ -919,16 +920,16 @@ impl App { } 'tabs: for entity in self.tab_model.iter() { - if let Some(Tab::Editor(tab)) = self.tab_model.data::(entity) { - if let Some(path) = &tab.path_opt { - for (_, project_path) in self.projects.iter() { - if path.starts_with(&project_path) { - // Do not watch tabs inside of already watched projects - continue 'tabs; - } + if let Some(Tab::Editor(tab)) = self.tab_model.data::(entity) + && let Some(path) = &tab.path_opt + { + for (_, project_path) in self.projects.iter() { + if path.starts_with(project_path) { + // Do not watch tabs inside of already watched projects + continue 'tabs; } - new_paths.insert((path.to_path_buf(), RecursiveMode::NonRecursive)); } + new_paths.insert((path.to_path_buf(), RecursiveMode::NonRecursive)); } } @@ -1443,7 +1444,7 @@ impl Application for App { let mut theme_names = Vec::with_capacity(SYNTAX_SYSTEM.get().unwrap().theme_set.themes.len()); - for (theme_name, _theme) in SYNTAX_SYSTEM.get().unwrap().theme_set.themes.iter() { + for theme_name in SYNTAX_SYSTEM.get().unwrap().theme_set.themes.keys() { theme_names.push(theme_name.to_string()); } @@ -1652,9 +1653,7 @@ impl Application for App { } fn dialog(&self) -> Option> { - let Some(ref dialog) = self.dialog_page_opt else { - return None; - }; + let dialog = self.dialog_page_opt.as_ref()?; let cosmic_theme::Spacing { space_xxs, .. } = self.core().system_theme().cosmic().spacing; @@ -1937,21 +1936,21 @@ impl Application for App { return self.update_config(); } Message::FindNext => { - if !self.find_search_value.is_empty() { - if let Some(Tab::Editor(tab)) = self.active_tab() { - //TODO: do not compile find regex on every search? - match self.config.find_regex(&self.find_search_value) { - Ok(regex) => { - tab.search(®ex, true, self.config.find_wrap_around); - } - Err(err) => { - //TODO: put regex error in find box - log::warn!( - "failed to compile regex {:?}: {}", - self.find_search_value, - err - ); - } + if !self.find_search_value.is_empty() + && let Some(Tab::Editor(tab)) = self.active_tab() + { + //TODO: do not compile find regex on every search? + match self.config.find_regex(&self.find_search_value) { + Ok(regex) => { + tab.search(®ex, true, self.config.find_wrap_around); + } + Err(err) => { + //TODO: put regex error in find box + log::warn!( + "failed to compile regex {:?}: {}", + self.find_search_value, + err + ); } } } @@ -1960,21 +1959,21 @@ impl Application for App { return self.update_focus(); } Message::FindPrevious => { - if !self.find_search_value.is_empty() { - if let Some(Tab::Editor(tab)) = self.active_tab() { - //TODO: do not compile find regex on every search? - match self.config.find_regex(&self.find_search_value) { - Ok(regex) => { - tab.search(®ex, false, self.config.find_wrap_around); - } - Err(err) => { - //TODO: put regex error in find box - log::warn!( - "failed to compile regex {:?}: {}", - self.find_search_value, - err - ); - } + if !self.find_search_value.is_empty() + && let Some(Tab::Editor(tab)) = self.active_tab() + { + //TODO: do not compile find regex on every search? + match self.config.find_regex(&self.find_search_value) { + Ok(regex) => { + tab.search(®ex, false, self.config.find_wrap_around); + } + Err(err) => { + //TODO: put regex error in find box + log::warn!( + "failed to compile regex {:?}: {}", + self.find_search_value, + err + ); } } } @@ -1983,27 +1982,27 @@ impl Application for App { return self.update_focus(); } Message::FindReplace => { - if !self.find_search_value.is_empty() { - if let Some(Tab::Editor(tab)) = self.active_tab() { - //TODO: do not compile find regex on every search? - match self.config.find_regex(&self.find_search_value) { - Ok(regex) => { - //TODO: support captures - tab.replace( - ®ex, - &self.find_replace_value, - self.config.find_wrap_around, - ); - return self.update(Message::TabChanged(self.tab_model.active())); - } - Err(err) => { - //TODO: put regex error in find box - log::warn!( - "failed to compile regex {:?}: {}", - self.find_search_value, - err - ); - } + if !self.find_search_value.is_empty() + && let Some(Tab::Editor(tab)) = self.active_tab() + { + //TODO: do not compile find regex on every search? + match self.config.find_regex(&self.find_search_value) { + Ok(regex) => { + //TODO: support captures + tab.replace( + ®ex, + &self.find_replace_value, + self.config.find_wrap_around, + ); + return self.update(Message::TabChanged(self.tab_model.active())); + } + Err(err) => { + //TODO: put regex error in find box + log::warn!( + "failed to compile regex {:?}: {}", + self.find_search_value, + err + ); } } } @@ -2012,27 +2011,27 @@ impl Application for App { return self.update_focus(); } Message::FindReplaceAll => { - if !self.find_search_value.is_empty() { - if let Some(Tab::Editor(tab)) = self.active_tab() { - //TODO: do not compile find regex on every search? - match self.config.find_regex(&self.find_search_value) { - Ok(regex) => { - //TODO: support captures - { - let mut editor = tab.editor.lock().unwrap(); - editor.set_cursor(cosmic_text::Cursor::new(0, 0)); - } - while tab.replace(®ex, &self.find_replace_value, false) {} - return self.update(Message::TabChanged(self.tab_model.active())); - } - Err(err) => { - //TODO: put regex error in find box - log::warn!( - "failed to compile regex {:?}: {}", - self.find_search_value, - err - ); + if !self.find_search_value.is_empty() + && let Some(Tab::Editor(tab)) = self.active_tab() + { + //TODO: do not compile find regex on every search? + match self.config.find_regex(&self.find_search_value) { + Ok(regex) => { + //TODO: support captures + { + let mut editor = tab.editor.lock().unwrap(); + editor.set_cursor(cosmic_text::Cursor::new(0, 0)); } + while tab.replace(®ex, &self.find_replace_value, false) {} + return self.update(Message::TabChanged(self.tab_model.active())); + } + Err(err) => { + //TODO: put regex error in find box + log::warn!( + "failed to compile regex {:?}: {}", + self.find_search_value, + err + ); } } } @@ -2172,18 +2171,14 @@ impl Application for App { // Reload tabs that changed let mut tab_reload = Vec::new(); for entity in self.tab_model.iter() { - if let Some(Tab::Editor(tab)) = self.tab_model.data::(entity) { - if let Some(path) = &tab.path_opt { - if event.paths.contains(path) { - if tab.changed() { - log::warn!( - "file changed externally before being saved: {:?}", - path - ); - } else { - tab_reload.push(entity); - } - } + if let Some(Tab::Editor(tab)) = self.tab_model.data::(entity) + && let Some(path) = &tab.path_opt + && event.paths.contains(path) + { + if tab.changed() { + log::warn!("file changed externally before being saved: {:?}", path); + } else { + tab_reload.push(entity); } } } @@ -2281,7 +2276,7 @@ impl Application for App { { for (_, project_path) in self.projects.iter() { for path in event.paths.iter() { - if let Ok(prefix) = path.strip_prefix(&project_path) { + if let Ok(prefix) = path.strip_prefix(project_path) { // Manually ignore project .git folders //TODO: use logic from ignore crate somehow? if prefix.starts_with(".git") { @@ -2351,10 +2346,10 @@ impl Application for App { { let mut close = Vec::new(); for entity in self.tab_model.iter() { - if let Some(Tab::GitDiff(other_tab)) = self.tab_model.data::(entity) { - if other_tab.diff.path == diff.path { - close.push(entity); - } + if let Some(Tab::GitDiff(other_tab)) = self.tab_model.data::(entity) + && other_tab.diff.path == diff.path + { + close.push(entity); } } for entity in close { @@ -2672,10 +2667,10 @@ impl Application for App { tab.path_opt = Some(paths.remove(0)); title_opt = Some(tab.title()); tab.save(); - if let Some(path) = tab.path_opt.clone() { - if let Ok(canonical) = fs::canonicalize(&path) { - self.add_to_recents(&canonical); - } + if let Some(path) = tab.path_opt.clone() + && let Ok(canonical) = fs::canonicalize(&path) + { + self.add_to_recents(&canonical); } } if let Some(title) = title_opt { @@ -2851,13 +2846,7 @@ impl Application for App { .tab_model .position(self.tab_model.active()) .and_then(|i| (i as usize).checked_sub(1)) - .unwrap_or_else(|| { - self.tab_model - .iter() - .count() - .checked_sub(1) - .unwrap_or_default() - }); + .unwrap_or_else(|| self.tab_model.iter().count().saturating_sub(1)); let entity = self.tab_model.iter().nth(pos); if let Some(entity) = entity { diff --git a/src/menu.rs b/src/menu.rs index 18e5bdb..79388bc 100644 --- a/src/menu.rs +++ b/src/menu.rs @@ -12,7 +12,11 @@ use cosmic::{ responsive_menu_bar, segmented_button, }, }; -use std::{collections::HashMap, path::PathBuf, sync::LazyLock}; +use std::{ + collections::HashMap, + path::{Path, PathBuf}, + sync::LazyLock, +}; use crate::{Action, Config, ConfigState, Message, fl}; @@ -60,7 +64,7 @@ fn truncate_middle(value: &str, max_chars: usize) -> String { ) } -fn format_recent_menu_path(path: &PathBuf, home_dir_opt: Option<&PathBuf>) -> String { +fn format_recent_menu_path(path: &Path, home_dir_opt: Option<&PathBuf>) -> String { const ELLIPSIS: &str = "..."; let display = if let Some(home_dir) = home_dir_opt { @@ -163,7 +167,7 @@ pub fn menu_bar<'a>( config: &Config, config_state: &ConfigState, key_binds: &HashMap, - projects: &Vec<(String, PathBuf)>, + projects: &[(String, PathBuf)], has_selection: bool, ) -> Element<'a, Message> { //TODO: port to libcosmic diff --git a/src/project.rs b/src/project.rs index 11c8978..0a13262 100644 --- a/src/project.rs +++ b/src/project.rs @@ -29,15 +29,15 @@ impl ProjectNode { let path = fs::canonicalize(path)?; let name = path .file_name() - .ok_or(io::Error::new( - io::ErrorKind::Other, - format!("path {:?} has no file name", path), - ))? + .ok_or(io::Error::other(format!( + "path {:?} has no file name", + path + )))? .to_str() - .ok_or(io::Error::new( - io::ErrorKind::Other, - format!("path {:?} is not valid UTF-8", path), - ))? + .ok_or(io::Error::other(format!( + "path {:?} is not valid UTF-8", + path + )))? .to_string(); Ok(if path.is_dir() { Self::Folder { diff --git a/src/search.rs b/src/search.rs index 7eaed1a..cbefcd2 100644 --- a/src/search.rs +++ b/src/search.rs @@ -54,10 +54,10 @@ impl ProjectSearchResult { } }; - if let Some(file_type) = entry.file_type() { - if file_type.is_dir() { - continue; - } + if let Some(file_type) = entry.file_type() + && file_type.is_dir() + { + continue; } let entry_path = entry.path(); diff --git a/src/tab.rs b/src/tab.rs index d9a8e7a..120fff6 100644 --- a/src/tab.rs +++ b/src/tab.rs @@ -25,6 +25,7 @@ fn editor_text(editor: &ViEditor<'static, 'static>) -> String { }) } +#[allow(clippy::large_enum_variant)] pub enum Tab { Editor(EditorTab), GitDiff(GitDiffTab), @@ -313,7 +314,7 @@ impl EditorTab { .filter_map(|m| { if cursor.line != start_line || m.start() >= cursor.index - || m.start() < cursor.index && wrapped == true + || m.start() < cursor.index && wrapped { Some((m.start(), m.len())) } else { @@ -390,7 +391,7 @@ impl EditorTab { if cursor.line != start_line || m.start() > cursor.index || m.start() == cursor.index && current_selection == Selection::None - || m.start() < cursor.index && wrapped == true + || m.start() < cursor.index && wrapped { Some((m.start(), m.end())) } else { @@ -433,7 +434,7 @@ impl EditorTab { if cursor.line != start_line || m.start() < cursor.index || m.start() == cursor.index && current_selection == Selection::None - || m.start() > cursor.index && wrapped == true + || m.start() > cursor.index && wrapped { Some((m.start(), m.end())) } else { diff --git a/src/text_box.rs b/src/text_box.rs index 3b5dacd..de7050a 100644 --- a/src/text_box.rs +++ b/src/text_box.rs @@ -317,9 +317,8 @@ where editor.with_buffer(|buffer| { let mut layout_lines = 0; for line in buffer.lines.iter() { - match line.layout_opt() { - Some(layout) => layout_lines += layout.len(), - None => (), + if let Some(layout) = line.layout_opt() { + layout_lines += layout.len() } } @@ -755,7 +754,7 @@ where match editor.buffer_ref() { cosmic_text::BufferRef::Arc(buffer) => { renderer.fill_raw(Raw { - buffer: Arc::downgrade(&buffer), + buffer: Arc::downgrade(buffer), position: pos, color: Color::from_rgba(1.0, 1.0, 1.0, 1.0), clip_bounds, @@ -1095,15 +1094,13 @@ where editor.set_redraw(true); shell.capture_event(); } - Named::Tab => { - if !modifiers.control() && !modifiers.alt() { - if modifiers.shift() { - editor.action(Action::Unindent); - } else { - editor.action(Action::Indent); - } - shell.capture_event(); + Named::Tab if !modifiers.control() && !modifiers.alt() => { + if modifiers.shift() { + editor.action(Action::Unindent); + } else { + editor.action(Action::Indent); } + shell.capture_event(); } _ => (), }, @@ -1152,7 +1149,7 @@ where InputMethodEvent::Commit(text) => { if state.is_focused { editor.start_change(); - editor.insert_string(&text, None); + editor.insert_string(text, None); editor.finish_change(); shell.capture_event(); } @@ -1174,13 +1171,13 @@ where let y = y_logical * scale_factor; // Do this first as the horizontal scrollbar is on top of the buffer - if let Some(scrollbar_h_rect) = state.scrollbar_h_rect.get() { - if scrollbar_h_rect.contains(Point::new(x_logical, y_logical)) { - state.dragging = Some(Dragging::ScrollbarH { - start_x: x, - start_scroll: editor.with_buffer(|buffer| buffer.scroll()), - }); - } + if let Some(scrollbar_h_rect) = state.scrollbar_h_rect.get() + && scrollbar_h_rect.contains(Point::new(x_logical, y_logical)) + { + state.dragging = Some(Dragging::ScrollbarH { + start_x: x, + start_scroll: editor.with_buffer(|buffer| buffer.scroll()), + }); } if matches!(state.dragging, Some(Dragging::ScrollbarH { .. })) { @@ -1207,7 +1204,7 @@ where ClickKind::Single }; let maybe_anchor = if state.modifiers.shift() { - state.shift_anchor.lock().unwrap().clone() + *state.shift_anchor.lock().unwrap() } else { None }; @@ -1388,11 +1385,9 @@ where shell.capture_event(); } } - Event::Window(WindowEvent::RedrawRequested(_now)) => { - if state.is_focused { - state.caret_position = editor.cursor_position().unwrap_or(state.caret_position); - shell.request_input_method(&self.input_method(state, scale_factor, layout)); - } + Event::Window(WindowEvent::RedrawRequested(_now)) if state.is_focused => { + state.caret_position = editor.cursor_position().unwrap_or(state.caret_position); + shell.request_input_method(&self.input_method(state, scale_factor, layout)); } _ => (), } From 35b6a05bc1d19fdb36d13fcdf5419f79966d3a24 Mon Sep 17 00:00:00 2001 From: Michael Aaron Murphy Date: Mon, 5 Oct 2026 21:19:49 +0200 Subject: [PATCH 6/6] Epoch 1.10.0 version update [x] Generated by cosmic-epoch scripts/version-update.sh --- Cargo.lock | 402 ++++++++++++++++++++++------------------------- Cargo.toml | 2 +- cargo.just | 70 +++++++++ debian/changelog | 6 + 4 files changed, 267 insertions(+), 213 deletions(-) create mode 100644 cargo.just diff --git a/Cargo.lock b/Cargo.lock index 4db6bc5..552469e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,7 +55,7 @@ dependencies = [ "accesskit", "accesskit_consumer", "hashbrown 0.16.1", - "objc2 0.5.2", + "objc2 0.5.3", "objc2-app-kit 0.2.2", "objc2-foundation 0.2.2", ] @@ -207,7 +207,7 @@ dependencies = [ "ndk-context", "ndk-sys", "num_enum", - "thiserror 2.0.20", + "thiserror 2.0.21", ] [[package]] @@ -447,7 +447,7 @@ dependencies = [ "futures-lite", "parking", "polling", - "rustix 1.1.4", + "rustix 1.1.5", "slab", "windows-sys 0.61.2", ] @@ -478,18 +478,18 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "rustix 1.1.4", + "rustix 1.1.5", ] [[package]] name = "async-recursion" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +checksum = "4f8abc12baad266b1c8cec146854c195b5864b4221d4b2ca7296a7ae82d9e451" dependencies = [ "proc-macro2", "quote", - "syn 2.0.119", + "syn 3.0.6", ] [[package]] @@ -504,7 +504,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 1.1.4", + "rustix 1.1.5", "signal-hook-registry", "slab", "windows-sys 0.61.2", @@ -524,7 +524,7 @@ checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", ] [[package]] @@ -595,7 +595,7 @@ dependencies = [ "derive_utils", "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", ] [[package]] @@ -619,7 +619,7 @@ dependencies = [ "num-traits", "pastey", "rayon", - "thiserror 2.0.20", + "thiserror 2.0.21", "v_frame", "y4m", ] @@ -753,7 +753,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "objc2 0.5.2", + "objc2 0.5.3", ] [[package]] @@ -762,7 +762,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" dependencies = [ - "objc2 0.6.4", + "objc2 0.6.5", ] [[package]] @@ -821,7 +821,7 @@ dependencies = [ [[package]] name = "build_helpers" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "cfg_aliases", ] @@ -867,7 +867,7 @@ checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", ] [[package]] @@ -909,14 +909,13 @@ dependencies = [ [[package]] name = "calloop" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7" +checksum = "43b32313e937c8721c9d17ee9bf60699a6402b4b7c2cb6ac1bee0ffcaa4b4e5e" dependencies = [ "bitflags 2.13.2", "polling", - "rustix 1.1.4", - "slab", + "rustix 1.1.5", "tracing", ] @@ -927,16 +926,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa" dependencies = [ "calloop", - "rustix 1.1.4", + "rustix 1.1.5", "wayland-backend", "wayland-client", ] [[package]] name = "cc" -version = "1.4.6" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3eb0f42d6c360dc3f8a821f6bf2fdea7f72bfd36b3076eb0e6d1e9e0752fff4" +checksum = "f74872d07caf508b30a21f6836e7d7016a2eaf7d9ff4f48deaa58cd8a0407630" dependencies = [ "find-msvc-tools", "jobserver", @@ -957,9 +956,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.20.9" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe4ece8474b5f766c63426647e7b4b316b67431ade1036a8313cee24a03ae917" +checksum = "9ba9e9ec16c447027685b1f897b720e18e9a8afd00bd7332c483537e38086c9f" dependencies = [ "smallvec", "target-lexicon", @@ -1362,7 +1361,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1383,7 +1382,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "quote", "syn 2.0.119", @@ -1391,7 +1390,7 @@ dependencies = [ [[package]] name = "cosmic-edit" -version = "1.9.0" +version = "1.10.0" dependencies = [ "cosmic-files", "cosmic-syntax-theme", @@ -1423,7 +1422,7 @@ dependencies = [ [[package]] name = "cosmic-files" version = "1.9.0" -source = "git+https://github.com/pop-os/cosmic-files.git#fe71aca0e54d168443ef397e596e8d3e02eb1b46" +source = "git+https://github.com/pop-os/cosmic-files.git#f7679791f4fbf82ba7c9a01cf3f8ae0e21265975" dependencies = [ "anyhow", "atomic_float", @@ -1468,7 +1467,7 @@ dependencies = [ "slotmap", "tar", "tempfile", - "thiserror 2.0.20", + "thiserror 2.0.21", "tokio", "tracing", "tracing-subscriber", @@ -1491,7 +1490,7 @@ dependencies = [ "btoi", "memchr", "memmap2 0.9.11", - "thiserror 2.0.20", + "thiserror 2.0.21", "tracing", "xdg", ] @@ -1558,7 +1557,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "almost", "configparser", @@ -1570,7 +1569,7 @@ dependencies = [ "ron", "serde", "serde_json", - "thiserror 2.0.20", + "thiserror 2.0.21", ] [[package]] @@ -1805,7 +1804,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" dependencies = [ - "thiserror 2.0.20", + "thiserror 2.0.21", ] [[package]] @@ -1845,7 +1844,7 @@ checksum = "dc05a5d33db20c784f873e84934ad94bb209a090987ac5f62fede2c178234f23" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", ] [[package]] @@ -1943,7 +1942,7 @@ dependencies = [ "bitflags 2.13.2", "block2 0.6.2", "libc", - "objc2 0.6.4", + "objc2 0.6.5", ] [[package]] @@ -1954,7 +1953,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", ] [[package]] @@ -2051,13 +2050,12 @@ checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34" [[package]] name = "encoding_rs" -version = "0.8.41" +version = "0.8.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5ef0006ac9ab233c38522f5ae99cae3625151de8f706cacee1cba4b8e2832a" +checksum = "8e985e0451871ad22fb8d2b6b076e2028a502a0d3950998c2c5c0a4f9b5d9679" dependencies = [ "cfg-if", "core_detect", - "multiversion", "multiversion_no_op", "rustversion", "scopeguard", @@ -2272,9 +2270,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0f1c7c3a72c66fd80abe965175f7523475c0489a87d3ff9d6e8c87d87a9d2d" +checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484" [[package]] name = "fixed_decimal" @@ -2361,7 +2359,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54f0d287c53ffd184d04d8677f590f4ac5379785529e5e08b1c8083acdd5c198" dependencies = [ "memchr", - "thiserror 2.0.20", + "thiserror 2.0.21", ] [[package]] @@ -2402,9 +2400,9 @@ dependencies = [ [[package]] name = "font-types" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8eb065f3251655b3c90e22e5e363f310fc5332fb3402e37bbc94752283248f6" +checksum = "6c92d9081c7ab3bd83ef1eecdfad090f3d966e3ce74106779664114cfe1a6274" dependencies = [ "bytemuck", ] @@ -2450,7 +2448,7 @@ checksum = "ea5190182e6915eb873ddbc16e23b711b6eb1f9c00a0d0a3a91b5f6228475225" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", ] [[package]] @@ -2574,7 +2572,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", ] [[package]] @@ -2608,9 +2606,9 @@ dependencies = [ [[package]] name = "generator" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3b854b0e584ead1a33f18b2fcad7cf7be18b3875c78816b753639aa501513ae" +checksum = "54ade96dc9003043bce7c035c85a9df5a858bfb2039c5a2e6fdf00f324f6c551" dependencies = [ "cc", "cfg-if", @@ -2637,7 +2635,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8" dependencies = [ - "rustix 1.1.4", + "rustix 1.1.5", "windows-link 0.2.1", ] @@ -2849,7 +2847,7 @@ dependencies = [ "hashbrown 0.16.1", "log", "presser", - "thiserror 2.0.20", + "thiserror 2.0.21", "windows 0.62.2", ] @@ -3186,7 +3184,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "build_helpers", "dnd", @@ -3201,14 +3199,14 @@ dependencies = [ "iced_winit", "image", "mime 0.1.0", - "thiserror 2.0.20", + "thiserror 2.0.21", "window_clipboard", ] [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "accesskit", "accesskit_winit", @@ -3217,7 +3215,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "bitflags 2.13.2", "build_helpers", @@ -3234,7 +3232,7 @@ dependencies = [ "rustc-hash 2.1.3", "serde", "smol_str", - "thiserror 2.0.20", + "thiserror 2.0.21", "unicode-segmentation", "web-time", "window_clipboard", @@ -3243,7 +3241,7 @@ dependencies = [ [[package]] name = "iced_debug" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "iced_core", "iced_futures", @@ -3253,7 +3251,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "futures", "iced_core", @@ -3267,7 +3265,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "bitflags 2.13.2", "bytemuck", @@ -3281,14 +3279,14 @@ dependencies = [ "lyon_path", "raw-window-handle", "rustc-hash 2.1.3", - "thiserror 2.0.20", + "thiserror 2.0.21", "unicode-segmentation", ] [[package]] name = "iced_program" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "iced_graphics", "iced_runtime", @@ -3297,19 +3295,19 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "iced_graphics", "iced_tiny_skia", "iced_wgpu", "log", - "thiserror 2.0.20", + "thiserror 2.0.21", ] [[package]] name = "iced_runtime" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "build_helpers", "bytes", @@ -3318,14 +3316,14 @@ dependencies = [ "iced_core", "iced_futures", "raw-window-handle", - "thiserror 2.0.20", + "thiserror 2.0.21", "window_clipboard", ] [[package]] name = "iced_tiny_skia" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "bytemuck", "cosmic-text", @@ -3342,7 +3340,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "as-raw-xcb-connection", "bitflags 2.13.2", @@ -3361,7 +3359,7 @@ dependencies = [ "resvg", "rustc-hash 2.1.3", "rustix 0.38.44", - "thiserror 2.0.20", + "thiserror 2.0.21", "tiny-xlib", "wayland-backend", "wayland-client", @@ -3374,7 +3372,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.2" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "build_helpers", "cosmic-client-toolkit", @@ -3385,7 +3383,7 @@ dependencies = [ "num-traits", "ouroboros", "rustc-hash 2.1.3", - "thiserror 2.0.20", + "thiserror 2.0.21", "unicode-segmentation", "window_clipboard", ] @@ -3393,7 +3391,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "build_helpers", "cosmic-client-toolkit", @@ -3408,7 +3406,7 @@ dependencies = [ "raw-window-handle", "rustc-hash 2.1.3", "rustix 0.38.44", - "thiserror 2.0.20", + "thiserror 2.0.21", "wasm-bindgen-futures", "wayland-backend", "wayland-client", @@ -3841,9 +3839,9 @@ dependencies = [ [[package]] name = "icu_time_data" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "005ff86fa5851a77fc0a977b72d717f777bd9230415a247219d7898aefb1517a" +checksum = "d9e21be527807cda7562cbfbdb04179f9cca46c12691d6a8073ffae6cfd7aeec" [[package]] name = "ident_case" @@ -4137,7 +4135,7 @@ dependencies = [ "jni-sys 0.4.1", "log", "simd_cesu8", - "thiserror 2.0.20", + "thiserror 2.0.21", "walkdir", "windows-link 0.2.1", ] @@ -4195,9 +4193,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.105" +version = "0.3.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce57d20d1ea864ce2ac172ab472d409214f4fd359f0b2a2775abdf522e2af99e" +checksum = "7883d941dae510fb2d978fc3fe018c71c9e2892fd38854de3e8b92c2e5ad9cc5" dependencies = [ "cfg-if", "futures-util", @@ -4472,9 +4470,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +checksum = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb" [[package]] name = "lebe" @@ -4490,14 +4488,14 @@ checksum = "34b357333733e8260735ba5894eb928c02ecc69c78715f01a8019e7fa7f2db4c" [[package]] name = "libc" -version = "0.2.189" +version = "0.2.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2" +checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78" [[package]] name = "libcosmic" version = "1.0.0" -source = "git+https://github.com/pop-os/libcosmic.git#08a09e3dfa1f729d52585fcedd6e731130235363" +source = "git+https://github.com/pop-os/libcosmic.git#5a8bd9482a35ae94c1e54edf77b331c6b970f170" dependencies = [ "apply", "ashpd 0.12.3", @@ -4535,7 +4533,7 @@ dependencies = [ "serde", "slotmap", "taffy", - "thiserror 2.0.20", + "thiserror 2.0.21", "tokio", "tracing", "unicode-segmentation", @@ -4571,9 +4569,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libredox" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6480ccc157a1389bb2e4891b24751b0f798ba640d22386f23143fbcc89da195a" +checksum = "61ff90caf6077a803a240f62fdbe88645a890bbca49ef8174c3cb0404362171d" dependencies = [ "bitflags 2.13.2", "libc", @@ -4875,9 +4873,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.2.3" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18443e9c262bfe8fa82f51666e2642c53393f7e5c27b3e1aeab922cff5b9d8" +checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee" dependencies = [ "libc", "log", @@ -4904,27 +4902,6 @@ dependencies = [ "pxfm", ] -[[package]] -name = "multiversion" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ca4bea16ffc3f443cf7d866912118196bfef4c6a1556ca00f9f9b00bb43f7c" -dependencies = [ - "multiversion-macros", -] - -[[package]] -name = "multiversion-macros" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d416831a7317ef4b08bee00b69cbbb9c8763da7959a7026244d6266869f9c83" -dependencies = [ - "proc-macro2", - "quote", - "rustversion", - "syn 3.0.5", -] - [[package]] name = "multiversion_no_op" version = "1.0.0" @@ -4959,7 +4936,7 @@ dependencies = [ "once_cell", "rustc-hash 1.1.0", "spirv", - "thiserror 2.0.20", + "thiserror 2.0.21", "unicode-ident", ] @@ -5220,9 +5197,9 @@ checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +checksum = "19d5490aaf8f1d7cf7688dfa9b0ce07900e168852c45cd2c03f534dfd27cfd0b" dependencies = [ "objc-sys", "objc2-encode", @@ -5230,9 +5207,9 @@ dependencies = [ [[package]] name = "objc2" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f" +checksum = "08849bbd4767dfae9457696856ae1c84fe4e0281bbe4a7abff2d0e06fb7981f8" dependencies = [ "objc2-encode", ] @@ -5246,7 +5223,7 @@ dependencies = [ "bitflags 2.13.2", "block2 0.5.1", "libc", - "objc2 0.5.2", + "objc2 0.5.3", "objc2-core-data", "objc2-core-image", "objc2-foundation 0.2.2", @@ -5261,7 +5238,7 @@ checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ "bitflags 2.13.2", "block2 0.6.2", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-core-foundation", "objc2-foundation 0.3.2", ] @@ -5274,7 +5251,7 @@ checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ "bitflags 2.13.2", "block2 0.5.1", - "objc2 0.5.2", + "objc2 0.5.3", "objc2-foundation 0.2.2", ] @@ -5287,7 +5264,7 @@ dependencies = [ "bitflags 2.13.2", "block2 0.6.2", "dispatch2", - "objc2 0.6.4", + "objc2 0.6.5", ] [[package]] @@ -5308,7 +5285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" dependencies = [ "block2 0.5.1", - "objc2 0.5.2", + "objc2 0.5.3", "objc2-foundation 0.2.2", "objc2-metal", ] @@ -5339,7 +5316,7 @@ dependencies = [ "bitflags 2.13.2", "block2 0.5.1", "libc", - "objc2 0.5.2", + "objc2 0.5.3", ] [[package]] @@ -5350,7 +5327,7 @@ checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ "bitflags 2.13.2", "block2 0.6.2", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-core-foundation", ] @@ -5362,7 +5339,7 @@ checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ "bitflags 2.13.2", "block2 0.5.1", - "objc2 0.5.2", + "objc2 0.5.3", "objc2-foundation 0.2.2", ] @@ -5374,7 +5351,7 @@ checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ "bitflags 2.13.2", "block2 0.5.1", - "objc2 0.5.2", + "objc2 0.5.3", "objc2-foundation 0.2.2", "objc2-metal", ] @@ -5386,7 +5363,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" dependencies = [ "bitflags 2.13.2", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-core-foundation", "objc2-foundation 0.3.2", ] @@ -5634,9 +5611,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pest" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d45aeb61b4bf818e12d4205f2466f8c4748f85f4fce0146d1c03d69d753f0ad" +checksum = "45d3aca230fad2e6f6317ca0a72724338c4960cb97168a85cdee66df4a9a21a8" dependencies = [ "memchr", "ucd-trie", @@ -5644,9 +5621,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89cc5a242e25ed4e7704d0be240f2cfbe20a8c27e7e252d94835be93d92dc39f" +checksum = "284b60557f2c4a2e72ad3f2d34d42685a2fa4a6a61d0d2a10c0ae2a5e916c2cf" dependencies = [ "pest", "pest_generator", @@ -5654,9 +5631,9 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abf21475cc3820fe4b2ca2dc2142902f67a02189f3b5b3a229f4febc01a43e5" +checksum = "1d9d1f08a115309ee99268cf85e5228e0e56aa9caf8841ec12866b6be07c3109" dependencies = [ "pest", "pest_meta", @@ -5667,9 +5644,9 @@ dependencies = [ [[package]] name = "pest_meta" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adba4db388f687393c18c51348d44a41d870ca9df71a2c98172ea3035dc6936e" +checksum = "ed93ba1a9ffcca32130a5188701c81c0c49cf00d4b7c5007d5148951d743adcb" dependencies = [ "pest", ] @@ -5753,9 +5730,9 @@ checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pin-utils" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +checksum = "13bee6c73da26345c729282832b60b0363cf3dd9f4bfd81d8551b7a1c889a113" [[package]] name = "piper" @@ -5829,7 +5806,7 @@ dependencies = [ "concurrent-queue", "hermit-abi", "pin-project-lite", - "rustix 1.1.4", + "rustix 1.1.5", "windows-sys 0.61.2", ] @@ -5867,9 +5844,9 @@ dependencies = [ [[package]] name = "powerfmt" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +checksum = "4a6394b9e965e73d0a289ee54f589087e2c676aedf60885baf52c76b771e4958" [[package]] name = "ppmd-rust" @@ -5920,7 +5897,7 @@ dependencies = [ "proc-macro-error-attr3", "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", ] [[package]] @@ -5955,7 +5932,7 @@ dependencies = [ "chrono", "flate2", "procfs-core", - "rustix 1.1.4", + "rustix 1.1.5", ] [[package]] @@ -6182,7 +6159,7 @@ dependencies = [ "rand 0.9.5", "rand_chacha 0.9.0", "simd_helpers", - "thiserror 2.0.20", + "thiserror 2.0.21", "v_frame", "wasm-bindgen", ] @@ -6255,7 +6232,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709" dependencies = [ "bytemuck", - "font-types 0.12.5", + "font-types 0.12.6", "once_cell", ] @@ -6327,7 +6304,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60dc65c0ff1a7ae1294b0c67b9f14baf70b644404010370171787bfac1038fc0" dependencies = [ "libredox", - "thiserror 2.0.20", + "thiserror 2.0.21", ] [[package]] @@ -6393,7 +6370,7 @@ dependencies = [ "dispatch2", "js-sys", "log", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-app-kit 0.3.2", "objc2-core-foundation", "objc2-foundation 0.3.2", @@ -6515,9 +6492,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" +checksum = "891efababe418670775f199f0d233d84843c227a0949a883ce15b37c78d6629d" dependencies = [ "bitflags 2.13.2", "errno", @@ -6638,7 +6615,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", ] [[package]] @@ -6663,7 +6640,7 @@ checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", ] [[package]] @@ -6790,9 +6767,9 @@ dependencies = [ [[package]] name = "siphasher" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" +checksum = "33f4fe9184a62d842c9ef383018f3306d8ba224fd9d836f56d7288308847c256" [[package]] name = "skrifa" @@ -6831,9 +6808,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.16.1" +version = "1.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba467056f1b547ed52077911161fc86985becbc60e8e1857c8a144dab0def891" +checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e" [[package]] name = "smithay-client-toolkit" @@ -6850,8 +6827,8 @@ dependencies = [ "log", "memmap2 0.9.11", "pkg-config", - "rustix 1.1.4", - "thiserror 2.0.20", + "rustix 1.1.5", + "thiserror 2.0.21", "wayland-backend", "wayland-client", "wayland-csd-frame", @@ -7022,9 +6999,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.5" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12df2e0110f65b775f769bb17ef989067a1d931b2eb822bd4346631eeada89f9" +checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee" dependencies = [ "proc-macro2", "quote", @@ -7049,7 +7026,7 @@ checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", ] [[package]] @@ -7068,7 +7045,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "thiserror 2.0.20", + "thiserror 2.0.21", "walkdir", "yaml-rust", ] @@ -7133,7 +7110,7 @@ dependencies = [ "fastrand", "getrandom 0.4.3", "once_cell", - "rustix 1.1.4", + "rustix 1.1.5", "windows-sys 0.61.2", ] @@ -7163,11 +7140,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.20" +version = "2.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f" +checksum = "09e52cb86a36cede5cb101bf8908837b3e4c6e5e59fe7fd85c23fb56200d189e" dependencies = [ - "thiserror-impl 2.0.20", + "thiserror-impl 2.0.21", ] [[package]] @@ -7183,13 +7160,13 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.20" +version = "2.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af" +checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", ] [[package]] @@ -7329,9 +7306,9 @@ checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee" [[package]] name = "tokio" -version = "1.53.1" +version = "1.53.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "202caea871b69668250d242070849eb495be178ed697a3e98aebce5bc81a0bed" +checksum = "e95f91fcc7a621e8b030f6aa23c71fe9838ae2fb4d8118b75602a328f5144044" dependencies = [ "bytes", "libc", @@ -7352,7 +7329,7 @@ checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", ] [[package]] @@ -7538,7 +7515,7 @@ dependencies = [ "chrono", "libc", "log", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-foundation 0.3.2", "once_cell", "percent-encoding", @@ -7641,9 +7618,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" +checksum = "357cc3acc6a036009fd6c973ed009037c732d60d0b4f6c673e9041497482a28f" [[package]] name = "unicode-bidi" @@ -7665,9 +7642,9 @@ checksum = "ce61d488bcdc9bc8b5d1772c404828b17fc481c0a582b5581e95fb233aef503e" [[package]] name = "unicode-ident" -version = "1.0.24" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" +checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954" [[package]] name = "unicode-linebreak" @@ -7771,9 +7748,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.26.1" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef6dac1e96601b4fb3acccccff2139741fcb757cb9a36089bf5be91cfb285ce" +checksum = "97277d36b9c3ace13e58fa6e753f8b0bbbf302a18dd193240d70f9e29681059a" dependencies = [ "js-sys", "serde_core", @@ -7846,9 +7823,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.128" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aecb87a33d3b0c5e3b7aa46336eaf486cffafbd281b195e4c8b80d50df2351bf" +checksum = "9bb54f33acc68fd454578d9820b0bde1a1a3d17aa17bb7b6595806d02886d409" dependencies = [ "cfg-if", "once_cell", @@ -7859,19 +7836,20 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.78" +version = "0.4.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ef4c5d3d2cdf5c54f4231181768f5510842e350db025faf1f7163b1030ed928" +checksum = "3cbab34de2d982e9b48e18d216d04c4a6f641066ff19ffb699980f591ee3610e" dependencies = [ "js-sys", + "tokio", "wasm-bindgen", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.128" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a690d511e3c1a8b3a55e33511e3c2c00c78415cd23650f32b808627f5696b9ed" +checksum = "2e29d0c35b16e224a7eeb5cd2d25e3e1968fbd65604117b44d3b789d00ee8535" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7879,22 +7857,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.128" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "411e4887f0071ef2d2164a9d5fdf2d20efbef78fccd3a78b0c10a1dc5295e48a" +checksum = "6f501a8bc3719dba86ef8ae4728879c08001bea749eb1333ac5b91e040e2a6b7" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.128" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81941cd78d0c92026c33e5e01312845a4cb1e9af3407f9134b100dd03144103e" +checksum = "23f0c9c52aa7cd7d77769a4cfe2a9adb1b331f489a41d912ce14513d5ab995c6" dependencies = [ "unicode-ident", ] @@ -7921,7 +7899,7 @@ checksum = "38a91b4eaddff87b1cd1074985e3713da4af2c49742d1b356b2c01670a67a078" dependencies = [ "cc", "downcast-rs", - "rustix 1.1.4", + "rustix 1.1.5", "scoped-tls", "smallvec", "wayland-sys", @@ -7934,7 +7912,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c36a0f861ad76d0901f2800b46321410d9f73f2ea88aac0650d86c32688073" dependencies = [ "bitflags 2.13.2", - "rustix 1.1.4", + "rustix 1.1.5", "wayland-backend", "wayland-scanner", ] @@ -7956,7 +7934,7 @@ version = "0.31.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a52d18780be9b1314328a3de5f930b73d2200112e3849ca6cb11822793fb34d" dependencies = [ - "rustix 1.1.4", + "rustix 1.1.5", "wayland-client", "xcursor", ] @@ -8046,7 +8024,7 @@ checksum = "0dde9c29be0f723a573977de51ee455bf3dfa03652730a74f9dd3b337e374d75" dependencies = [ "bitflags 2.13.2", "downcast-rs", - "rustix 1.1.4", + "rustix 1.1.5", "wayland-backend", "wayland-scanner", ] @@ -8065,9 +8043,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.105" +version = "0.3.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fbddc4a036f00ec4f18c83445bd3115cb306a91da554919a099d9222fe4a7f8" +checksum = "88261b9deccee56594c11a3460c462c41f58d148598fe70ad77070126a68aba4" dependencies = [ "js-sys", "wasm-bindgen", @@ -8143,7 +8121,7 @@ dependencies = [ "raw-window-handle", "rustc-hash 1.1.0", "smallvec", - "thiserror 2.0.20", + "thiserror 2.0.21", "wgpu-core-deps-apple", "wgpu-core-deps-emscripten", "wgpu-core-deps-windows-linux-android", @@ -8218,7 +8196,7 @@ dependencies = [ "raw-window-handle", "renderdoc-sys", "smallvec", - "thiserror 2.0.20", + "thiserror 2.0.21", "wasm-bindgen", "web-sys", "wgpu-types", @@ -8732,7 +8710,7 @@ dependencies = [ "dpi", "libc", "raw-window-handle", - "rustix 1.1.4", + "rustix 1.1.5", "smol_str", "tracing", "winit-android", @@ -8771,7 +8749,7 @@ dependencies = [ "block2 0.6.2", "dispatch2", "dpi", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-app-kit 0.3.2", "objc2-core-foundation", "objc2-core-graphics", @@ -8790,7 +8768,7 @@ version = "0.31.0-beta.2" source = "git+https://github.com/pop-os/winit.git?rev=9567503#9567503d34130113e36b0167a2b8829c3756e429" dependencies = [ "memmap2 0.9.11", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-core-foundation", "smol_str", "tracing", @@ -8838,7 +8816,7 @@ dependencies = [ "block2 0.6.2", "dispatch2", "dpi", - "objc2 0.6.4", + "objc2 0.6.5", "objc2-core-foundation", "objc2-foundation 0.3.2", "objc2-ui-kit", @@ -8862,7 +8840,7 @@ dependencies = [ "libc", "memmap2 0.9.11", "raw-window-handle", - "rustix 1.1.4", + "rustix 1.1.5", "sctk-adwaita", "smithay-client-toolkit", "smol_str", @@ -8926,7 +8904,7 @@ dependencies = [ "libc", "percent-encoding", "raw-window-handle", - "rustix 1.1.4", + "rustix 1.1.5", "smol_str", "tracing", "winit-common", @@ -8997,7 +8975,7 @@ dependencies = [ "libc", "libloading", "once_cell", - "rustix 1.1.4", + "rustix 1.1.5", "x11rb-protocol", "xcursor", ] @@ -9015,7 +8993,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" dependencies = [ "libc", - "rustix 1.1.4", + "rustix 1.1.5", ] [[package]] @@ -9165,13 +9143,13 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33811428bee40dbceb6d545e95754741d17a6aef9a4849f0fd62e2ba4f412a78" +checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", "synstructure", ] @@ -9197,7 +9175,7 @@ dependencies = [ "hex", "libc", "ordered-stream", - "rustix 1.1.4", + "rustix 1.1.5", "serde", "serde_repr", "tokio", @@ -9244,7 +9222,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", "zbus_names", "zvariant", "zvariant_utils", @@ -9290,18 +9268,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524" [[package]] name = "zerocopy" -version = "0.8.57" +version = "0.8.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d35102a9f36d089ccae9e4c6802bc118be4487b80aaffc0ab4e0cf5ce92d2873" +checksum = "6df92bf3d9227be3d53173901ddbffac2babc27ae50f397776ffd6dc33f800cb" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.57" +version = "0.8.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c01f5ab44258da43cf276c74a2763db2ff3969c9c652c3f2de07041d0b2bc" +checksum = "ac4f328cf2f05d084e496c3e9c3f33ed0a183656a16e1fcec4d464d8373aec82" dependencies = [ "proc-macro2", "quote", @@ -9325,7 +9303,7 @@ checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", "synstructure", ] @@ -9367,7 +9345,7 @@ checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da" dependencies = [ "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", ] [[package]] @@ -9513,7 +9491,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 3.0.5", + "syn 3.0.6", "zvariant_utils", ] @@ -9526,6 +9504,6 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 3.0.5", + "syn 3.0.6", "winnow 1.0.4", ] diff --git a/Cargo.toml b/Cargo.toml index 3310de5..79eccf4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cosmic-edit" -version = "1.9.0" +version = "1.10.0" authors = ["Jeremy Soller "] edition = "2024" license = "GPL-3.0-only" diff --git a/cargo.just b/cargo.just new file mode 100644 index 0000000..fb09e1e --- /dev/null +++ b/cargo.just @@ -0,0 +1,70 @@ +cargo-target-dir := env('CARGO_TARGET_DIR', 'target') + +# Compile with debug profile +[no-cd] +build-debug *args: + cargo build {{args}} + +# Compile with release profile +[no-cd] +build-release *args: (build-debug '--release' args) + +# Compile with a vendored tarball +[no-cd] +build-vendored *args: vendor-extract (build-release '--frozen --offline' args) + +# Check for errors and linter warnings +[no-cd] +check *args: + cargo clippy --all-features {{args}} -- -W clippy::pedantic + +# Runs a check with JSON message format for IDE integration +[no-cd] +check-json: (check '--message-format=json') + +# Remove Cargo build artifacts +[no-cd] +clean: + cargo clean + +# Also remove .cargo and vendored dependencies +[no-cd] +clean-dist: clean + rm -rf .cargo vendor vendor.tar target + +# Run the application for testing purposes +[no-cd] +run *args: + cargo run {{args}} + +# Run `cargo test` +[no-cd] +test *args: + cargo test {{args}} + +# Vendor Cargo dependencies locally +[no-cd] +vendor: + #!/usr/bin/env bash + mkdir -p .cargo + cargo vendor --locked | head -n -1 > .cargo/config.toml + echo 'directory = "vendor"' >> .cargo/config.toml + echo >> .cargo/config.toml + echo '[env]' >> .cargo/config.toml + if [ -n "${SOURCE_DATE_EPOCH}" ] + then + source_date="$(date -d "@${SOURCE_DATE_EPOCH}" "+%Y-%m-%d")" + echo "VERGEN_GIT_COMMIT_DATE = \"${source_date}\"" >> .cargo/config.toml + fi + if [ -n "${SOURCE_GIT_HASH}" ] + then + echo "VERGEN_GIT_SHA = \"${SOURCE_GIT_HASH}\"" >> .cargo/config.toml + fi + tar pcf vendor.tar .cargo vendor + rm -rf .cargo vendor + +# Extracts vendored dependencies +[no-cd] +vendor-extract: + rm -rf vendor + tar pxf vendor.tar diff --git a/debian/changelog b/debian/changelog index 6ddbfa2..4a9fc2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cosmic-edit (1.10.0) noble; urgency=medium + + * Epoch 1.10.0 version update + + -- Michael Murphy Mon, 05 Oct 2026 21:19:33 +0200 + cosmic-edit (1.9.0) noble; urgency=medium * Epoch 1.9.0 version update