From 9be376c8afe9bcf7a7e93b58f8643be3dcc92773 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 10 Oct 2024 11:22:41 -0600 Subject: [PATCH] Update dependencies --- Cargo.lock | 134 ++++++++++++++++++++++++++-------------------------- src/main.rs | 6 ++- src/tab.rs | 16 +++++-- 3 files changed, 84 insertions(+), 72 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d379946..1dc3814 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -342,9 +342,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a" +checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9" dependencies = [ "enumflags2", "futures-channel", @@ -836,9 +836,9 @@ dependencies = [ [[package]] name = "bytemuck_derive" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", @@ -932,9 +932,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.25" +version = "1.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d9e0b4957f635b8d3da819d0db5603620467ecf1f692d22a8c2717ce27e6d8" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" dependencies = [ "jobserver", "libc", @@ -1210,7 +1210,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -1229,7 +1229,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "quote", "syn 1.0.109", @@ -1269,7 +1269,7 @@ dependencies = [ [[package]] name = "cosmic-files" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-files.git#e997bbbc1b642cd1cfd2f08b92df2c5be5657719" +source = "git+https://github.com/pop-os/cosmic-files.git#c3d09c3885ce7b506c0bbb7753384e2d819ca650" dependencies = [ "chrono", "dirs", @@ -1353,7 +1353,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "almost", "cosmic-config", @@ -2084,10 +2084,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "font-types" -version = "0.6.0" +name = "foldhash" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0189ccb084f77c5523e08288d418cbaa09c451a08515678a0aa265df9a8b60" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + +[[package]] +name = "font-types" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dda6e36206148f69fc6ecb1bb6c0dedd7ee469f3db1d0dc2045beea28430ca43" dependencies = [ "bytemuck", ] @@ -2636,6 +2642,11 @@ name = "hashbrown" version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] [[package]] name = "hassle-rs" @@ -2793,7 +2804,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "dnd", "iced_accessibility", @@ -2812,7 +2823,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "accesskit", "accesskit_unix", @@ -2822,7 +2833,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "bitflags 2.6.0", "dnd", @@ -2844,7 +2855,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "futures", "iced_core", @@ -2857,7 +2868,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -2881,7 +2892,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2893,7 +2904,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "dnd", "iced_accessibility", @@ -2907,7 +2918,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "enum-repr", "float-cmp", @@ -2934,7 +2945,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "iced_core", "once_cell", @@ -2944,7 +2955,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "bytemuck", "cosmic-text", @@ -2961,7 +2972,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "as-raw-xcb-connection", "bitflags 2.6.0", @@ -2990,7 +3001,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "dnd", "iced_accessibility", @@ -3007,7 +3018,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "dnd", "iced_accessibility", @@ -3423,9 +3434,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b" dependencies = [ "wasm-bindgen", ] @@ -3528,10 +3539,10 @@ checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#173a9557c2f03bc5fda132e884c11bf8661256ff" +source = "git+https://github.com/pop-os/libcosmic.git#100f75f88edc5b602e29587fd6698dbf0038901d" dependencies = [ "apply", - "ashpd 0.9.1", + "ashpd 0.9.2", "chrono", "cosmic-config", "cosmic-theme", @@ -3681,11 +3692,11 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.0", ] [[package]] @@ -4264,12 +4275,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.1" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" -dependencies = [ - "portable-atomic", -] +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "onig" @@ -4675,12 +4683,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2" -[[package]] -name = "portable-atomic" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" - [[package]] name = "powerfmt" version = "0.2.0" @@ -4747,9 +4749,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] @@ -4879,9 +4881,9 @@ checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" [[package]] name = "read-fonts" -version = "0.20.0" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c141b9980e1150201b2a3a32879001c8f975fe313ec3df5471a9b5c79a880cd" +checksum = "fb94d9ac780fdcf9b6b252253f7d8f221379b84bd3573131139b383df69f85e1" dependencies = [ "bytemuck", "font-types", @@ -5372,9 +5374,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "skrifa" -version = "0.20.0" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abea4738067b1e628c6ce28b2c216c19e9ea95715cdb332680e821c3bec2ef23" +checksum = "8e1c44ad1f6c5bdd4eefed8326711b7dbda9ea45dfd36068c427d332aa382cbe" dependencies = [ "bytemuck", "read-fonts", @@ -5602,9 +5604,9 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93cdc334a50fcc2aa3f04761af3b28196280a6aaadb1ef11215c478ae32615ac" +checksum = "cbd59f3f359ddd2c95af4758c18270eddd9c730dde98598023cdabff472c2ca2" dependencies = [ "skrifa", "yazi", @@ -6347,9 +6349,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887" dependencies = [ "cfg-if", "once_cell", @@ -6358,9 +6360,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e" dependencies = [ "bumpalo", "log", @@ -6373,9 +6375,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "65471f79c1022ffa5291d33520cbbb53b7687b01c2f8e83b57d102eed7ed479d" dependencies = [ "cfg-if", "js-sys", @@ -6385,9 +6387,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6395,9 +6397,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6" dependencies = [ "proc-macro2", "quote", @@ -6408,9 +6410,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9" [[package]] name = "wasm-timer" @@ -6563,9 +6565,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "44188d185b5bdcae1052d08bcbcf9091a5524038d4572cc4f4f2bb9d5554ddd9" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/src/main.rs b/src/main.rs index 0ab9659..2de9750 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1756,7 +1756,11 @@ impl Application for App { 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);; + tab.replace( + ®ex, + &self.find_replace_value, + self.config.find_wrap_around, + ); return self.update(Message::TabChanged(self.tab_model.active())); } Err(err) => { diff --git a/src/tab.rs b/src/tab.rs index e59c8c9..c61f43f 100644 --- a/src/tab.rs +++ b/src/tab.rs @@ -246,7 +246,10 @@ impl EditorTab { // If we haven't wrapped yet and we've reached the last line, reset cursor line to 0 and // set wrapped to true so we don't wrap again - if wrap_around && !wrapped && cursor.line == editor.with_buffer(|buffer| buffer.lines.len()) { + if wrap_around + && !wrapped + && cursor.line == editor.with_buffer(|buffer| buffer.lines.len()) + { cursor.line = 0; wrapped = true; } @@ -277,7 +280,7 @@ impl EditorTab { }) { cursor.index = start; editor.set_cursor(cursor); - + // Highlight searched text let selection = Selection::Normal(Cursor::new(cursor.line, end)); editor.set_selection(selection); @@ -289,7 +292,10 @@ impl EditorTab { // If we haven't wrapped yet and we've reached the last line, reset cursor line to 0 and // set wrapped to true so we don't wrap again - if wrap_around && !wrapped && cursor.line == editor.with_buffer(|buffer| buffer.lines.len()) { + if wrap_around + && !wrapped + && cursor.line == editor.with_buffer(|buffer| buffer.lines.len()) + { cursor.line = 0; wrapped = true; } @@ -320,7 +326,7 @@ impl EditorTab { return true; } - + // If we haven't wrapped yet and we've reached the first line, reset cursor line to the // last line and set wrapped to true so we don't wrap again if wrap_around && !wrapped && cursor.line == 0 { @@ -346,4 +352,4 @@ fn title_with_parent(path: &std::path::Path, file_name: &str) -> String { Some(parent) => [parent, "/", file_name].concat(), None => file_name.to_string(), } -} \ No newline at end of file +}