From 6c0280febdf252239b46cf2da6694da58478410a Mon Sep 17 00:00:00 2001 From: Gabriel Date: Tue, 22 Jul 2025 14:28:51 -0400 Subject: [PATCH] make dependencies easier --- Cargo.lock | 185 +++++++++++++++++++++++++++++------------------------ Cargo.toml | 2 +- src/lib.rs | 16 ++--- 3 files changed, 111 insertions(+), 92 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 34b6e12..4cc6f34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,7 +62,7 @@ dependencies = [ "log", "ndk", "ndk-context", - "ndk-sys 0.6.0+11769913", + "ndk-sys", "num_enum", "thiserror 1.0.69", ] @@ -581,10 +581,11 @@ dependencies = [ [[package]] name = "codespan-reporting" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81" dependencies = [ + "serde", "termcolor", "unicode-width 0.1.14", ] @@ -729,7 +730,7 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "cryoglyph" version = "0.1.0" -source = "git+https://github.com/iced-rs/cryoglyph.git?rev=a456d1c17bbcf33afcca41d9e5e299f9f1193819#a456d1c17bbcf33afcca41d9e5e299f9f1193819" +source = "git+https://github.com/iced-rs/cryoglyph.git?rev=453cedec0d2ec563bd7fa87e84a2319bcebb1ba3#453cedec0d2ec563bd7fa87e84a2319bcebb1ba3" dependencies = [ "cosmic-text", "etagere", @@ -1511,6 +1512,7 @@ checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" dependencies = [ "cfg-if", "crunchy", + "num-traits", ] [[package]] @@ -1522,12 +1524,6 @@ dependencies = [ "foldhash", ] -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - [[package]] name = "hermit-abi" version = "0.5.2" @@ -1679,7 +1675,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced#283d0e74a8050ea625da25e0b9180b65f11d1843" +source = "git+https://github.com/iced-rs/iced?branch=master#d4f8e1902322b239be9580b3afb936c99ec49b79" dependencies = [ "iced_core", "iced_debug", @@ -1694,7 +1690,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced#283d0e74a8050ea625da25e0b9180b65f11d1843" +source = "git+https://github.com/iced-rs/iced?branch=master#d4f8e1902322b239be9580b3afb936c99ec49b79" dependencies = [ "bitflags 2.9.1", "bytes", @@ -1712,7 +1708,7 @@ dependencies = [ [[package]] name = "iced_debug" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced#283d0e74a8050ea625da25e0b9180b65f11d1843" +source = "git+https://github.com/iced-rs/iced?branch=master#d4f8e1902322b239be9580b3afb936c99ec49b79" dependencies = [ "iced_core", "iced_futures", @@ -1722,7 +1718,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced#283d0e74a8050ea625da25e0b9180b65f11d1843" +source = "git+https://github.com/iced-rs/iced?branch=master#d4f8e1902322b239be9580b3afb936c99ec49b79" dependencies = [ "futures", "iced_core", @@ -1735,7 +1731,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced#283d0e74a8050ea625da25e0b9180b65f11d1843" +source = "git+https://github.com/iced-rs/iced?branch=master#d4f8e1902322b239be9580b3afb936c99ec49b79" dependencies = [ "bitflags 2.9.1", "bytemuck", @@ -1753,7 +1749,7 @@ dependencies = [ [[package]] name = "iced_program" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced#283d0e74a8050ea625da25e0b9180b65f11d1843" +source = "git+https://github.com/iced-rs/iced?branch=master#d4f8e1902322b239be9580b3afb936c99ec49b79" dependencies = [ "iced_graphics", "iced_runtime", @@ -1762,7 +1758,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced#283d0e74a8050ea625da25e0b9180b65f11d1843" +source = "git+https://github.com/iced-rs/iced?branch=master#d4f8e1902322b239be9580b3afb936c99ec49b79" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -1774,7 +1770,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced#283d0e74a8050ea625da25e0b9180b65f11d1843" +source = "git+https://github.com/iced-rs/iced?branch=master#d4f8e1902322b239be9580b3afb936c99ec49b79" dependencies = [ "bytes", "iced_core", @@ -1787,7 +1783,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced#283d0e74a8050ea625da25e0b9180b65f11d1843" +source = "git+https://github.com/iced-rs/iced?branch=master#d4f8e1902322b239be9580b3afb936c99ec49b79" dependencies = [ "bytemuck", "cosmic-text", @@ -1803,7 +1799,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced#283d0e74a8050ea625da25e0b9180b65f11d1843" +source = "git+https://github.com/iced-rs/iced?branch=master#d4f8e1902322b239be9580b3afb936c99ec49b79" dependencies = [ "bitflags 2.9.1", "bytemuck", @@ -1822,7 +1818,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced#283d0e74a8050ea625da25e0b9180b65f11d1843" +source = "git+https://github.com/iced-rs/iced?branch=master#d4f8e1902322b239be9580b3afb936c99ec49b79" dependencies = [ "iced_renderer", "iced_runtime", @@ -1838,7 +1834,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/iced-rs/iced#283d0e74a8050ea625da25e0b9180b65f11d1843" +source = "git+https://github.com/iced-rs/iced?branch=master#d4f8e1902322b239be9580b3afb936c99ec49b79" dependencies = [ "iced_debug", "iced_program", @@ -2179,9 +2175,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.5" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +checksum = "86ea4e65087ff52f3862caff188d489f1fab49a0cb09e01b2e3f1a617b10aaed" [[package]] name = "mac" @@ -2249,13 +2245,13 @@ dependencies = [ [[package]] name = "metal" -version = "0.31.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e" +checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605" dependencies = [ "bitflags 2.9.1", "block", - "core-graphics-types 0.1.3", + "core-graphics-types 0.2.0", "foreign-types 0.5.0", "log", "objc", @@ -2291,24 +2287,28 @@ dependencies = [ [[package]] name = "naga" -version = "24.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e380993072e52eef724eddfcde0ed013b0c023c3f0417336ed041aa9f076994e" +checksum = "916cbc7cb27db60be930a4e2da243cf4bc39569195f22fd8ee419cd31d5b662c" dependencies = [ "arrayvec", "bit-set", "bitflags 2.9.1", + "cfg-if", "cfg_aliases", "codespan-reporting", + "half", + "hashbrown", "hexf-parse", "indexmap", + "libm", "log", + "num-traits", + "once_cell", "rustc-hash 1.1.0", "spirv", - "strum", - "termcolor", "thiserror 2.0.12", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -2337,7 +2337,7 @@ dependencies = [ "bitflags 2.9.1", "jni-sys", "log", - "ndk-sys 0.6.0+11769913", + "ndk-sys", "num_enum", "raw-window-handle", "thiserror 1.0.69", @@ -2349,15 +2349,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-sys" -version = "0.5.0+25.2.9519653" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" -dependencies = [ - "jni-sys", -] - [[package]] name = "ndk-sys" version = "0.6.0+11769913" @@ -2399,6 +2390,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -2911,6 +2903,21 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "portable-atomic" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" + +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + [[package]] name = "potential_utf" version = "0.1.2" @@ -3655,28 +3662,6 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "strum" -version = "0.26.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn", -] - [[package]] name = "subtle" version = "2.6.1" @@ -4142,12 +4127,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c" -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - [[package]] name = "untrusted" version = "0.9.0" @@ -4446,18 +4425,21 @@ dependencies = [ [[package]] name = "wgpu" -version = "24.0.5" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0b3436f0729f6cdf2e6e9201f3d39dc95813fad61d826c1ed07918b4539353" +checksum = "70b6ff82bbf6e9206828e1a3178e851f8c20f1c9028e74dd3a8090741ccd5798" dependencies = [ "arrayvec", "bitflags 2.9.1", + "cfg-if", "cfg_aliases", "document-features", + "hashbrown", "js-sys", "log", "naga", "parking_lot", + "portable-atomic", "profiling", "raw-window-handle", "smallvec", @@ -4472,34 +4454,67 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "24.0.5" +version = "26.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f0aa306497a238d169b9dc70659105b4a096859a34894544ca81719242e1499" +checksum = "d5f62f1053bd28c2268f42916f31588f81f64796e2ff91b81293515017ca8bd9" dependencies = [ "arrayvec", + "bit-set", "bit-vec", "bitflags 2.9.1", "cfg_aliases", "document-features", + "hashbrown", "indexmap", "log", "naga", "once_cell", "parking_lot", + "portable-atomic", "profiling", "raw-window-handle", "rustc-hash 1.1.0", "smallvec", "thiserror 2.0.12", + "wgpu-core-deps-apple", + "wgpu-core-deps-emscripten", + "wgpu-core-deps-windows-linux-android", "wgpu-hal", "wgpu-types", ] [[package]] -name = "wgpu-hal" -version = "24.0.4" +name = "wgpu-core-deps-apple" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f112f464674ca69f3533248508ee30cb84c67cf06c25ff6800685f5e0294e259" +checksum = "18ae5fbde6a4cbebae38358aa73fcd6e0f15c6144b67ef5dc91ded0db125dbdf" +dependencies = [ + "wgpu-hal", +] + +[[package]] +name = "wgpu-core-deps-emscripten" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7670e390f416006f746b4600fdd9136455e3627f5bd763abf9a65daa216dd2d" +dependencies = [ + "wgpu-hal", +] + +[[package]] +name = "wgpu-core-deps-windows-linux-android" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "720a5cb9d12b3d337c15ff0e24d3e97ed11490ff3f7506e7f3d98c68fa5d6f14" +dependencies = [ + "wgpu-hal", +] + +[[package]] +name = "wgpu-hal" +version = "26.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2971a6c8b903aa9951cf3f3e4d8060904f8c8e905c11f7f5b228edf7faddb719" dependencies = [ "android_system_properties", "arrayvec", @@ -4508,13 +4523,15 @@ dependencies = [ "bitflags 2.9.1", "block", "bytemuck", + "cfg-if", "cfg_aliases", - "core-graphics-types 0.1.3", + "core-graphics-types 0.2.0", "glow", "glutin_wgl_sys", "gpu-alloc", "gpu-allocator", "gpu-descriptor", + "hashbrown", "js-sys", "khronos-egl", "libc", @@ -4522,16 +4539,16 @@ dependencies = [ "log", "metal", "naga", - "ndk-sys 0.5.0+25.2.9519653", + "ndk-sys", "objc", - "once_cell", "ordered-float", "parking_lot", + "portable-atomic", + "portable-atomic-util", "profiling", "range-alloc", "raw-window-handle", "renderdoc-sys", - "rustc-hash 1.1.0", "smallvec", "thiserror 2.0.12", "wasm-bindgen", @@ -4543,13 +4560,15 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "24.0.0" +version = "26.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50ac044c0e76c03a0378e7786ac505d010a873665e2d51383dcff8dd227dc69c" +checksum = "eca7a8d8af57c18f57d393601a1fb159ace8b2328f1b6b5f80893f7d672c9ae2" dependencies = [ "bitflags 2.9.1", + "bytemuck", "js-sys", "log", + "thiserror 2.0.12", "web-sys", ] diff --git a/Cargo.toml b/Cargo.toml index cf6f89e..53608bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ edition = "2024" [dependencies] ego-tree = "0.10.0" -iced = { git = "https://github.com/iced-rs/iced", version = "0.14.0-dev", features=["markdown"]} +iced = { git = "https://github.com/iced-rs/iced", branch = "master", features=["markdown"]} reqwest = {features=["blocking"], version="0.12.22"} rss = "2.0.12" scraper = "0.23.1" diff --git a/src/lib.rs b/src/lib.rs index 46ff9da..93ba7f5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -83,7 +83,7 @@ fn markdown_content(item: &Item) -> Content { Content::Markdown(markdown) } -fn media_content(item: &Item) -> Content{ +fn media_content(_: &Item) -> Content{ Content::Markdown("Media not supported yet".to_owned()) } @@ -96,28 +96,28 @@ fn process_content(items: Vec) -> Vec { Item::Title(_,_) => { result.push(markdown_content(i)); } - Item::Paragraph(children) => { + Item::Paragraph(_) => { result.push(markdown_content(i)); }, - Item::Link(href,children) => { + Item::Link(_,_) => { result.push(markdown_content(i)) } - Item::UnorderedList(children) => { + Item::UnorderedList(_) => { result.push(markdown_content(i)); } - Item::OrderedList(children) => { + Item::OrderedList(_) => { result.push(markdown_content(i)); } - Item::ListItem(children) => { + Item::ListItem(_) => { result.push(markdown_content(i)); } Item::Image(src) => { result.push(Content::Image(src.to_owned())); } - Item::Video(children) => { + Item::Video(_) => { result.push(media_content(i)); } - Item::Audio(children) => { + Item::Audio(_) => { result.push(media_content(i)); } _ => {