From 3101ed9b843ddf89c0c8f94dd1142e06879df461 Mon Sep 17 00:00:00 2001 From: Arnaud Gourlay Date: Wed, 18 Sep 2024 09:19:10 +0200 Subject: [PATCH] use stable iced 0.13.0 \o/ --- Cargo.lock | 193 ++++++++++++++++++----------------------------------- Cargo.toml | 3 +- 2 files changed, 66 insertions(+), 130 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index defc2b2..a15e001 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -547,20 +547,6 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" -[[package]] -name = "calloop" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" -dependencies = [ - "bitflags 2.6.0", - "log", - "polling", - "rustix", - "slab", - "thiserror", -] - [[package]] name = "calloop" version = "0.13.0" @@ -575,25 +561,13 @@ dependencies = [ "thiserror", ] -[[package]] -name = "calloop-wayland-source" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" -dependencies = [ - "calloop 0.12.4", - "rustix", - "wayland-backend", - "wayland-client", -] - [[package]] name = "calloop-wayland-source" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ - "calloop 0.13.0", + "calloop", "rustix", "wayland-backend", "wayland-client", @@ -1115,7 +1089,8 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dpi" version = "0.1.1" -source = "git+https://github.com/iced-rs/winit.git?rev=254d6b3420ce4e674f516f7a2bd440665e05484d#254d6b3420ce4e674f516f7a2bd440665e05484d" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" [[package]] name = "drm" @@ -1572,18 +1547,6 @@ dependencies = [ "gl_generator", ] -[[package]] -name = "glyphon" -version = "0.5.0" -source = "git+https://github.com/hecrj/glyphon.git?rev=feef9f5630c2adb3528937e55f7bfad2da561a65#feef9f5630c2adb3528937e55f7bfad2da561a65" -dependencies = [ - "cosmic-text", - "etagere", - "lru", - "rustc-hash 2.0.0", - "wgpu", -] - [[package]] name = "gpu-alloc" version = "0.6.0" @@ -1728,8 +1691,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iced" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#2e3082d6651d35a8239d19ab745507e1553e2ab1" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44ccdb0d1a25ff7581e75991229857c353c87d79c199d375af37d264f6fbd06d" dependencies = [ "iced_core", "iced_futures", @@ -1741,8 +1705,9 @@ dependencies = [ [[package]] name = "iced_core" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#2e3082d6651d35a8239d19ab745507e1553e2ab1" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce264c157ad3968928d93f9b244ad8ad63465b5a5c31c86c13199b333629f16f" dependencies = [ "bitflags 2.6.0", "bytes", @@ -1760,8 +1725,9 @@ dependencies = [ [[package]] name = "iced_futures" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#2e3082d6651d35a8239d19ab745507e1553e2ab1" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b47bd5c48706c57004c8a2d4cb127cb4535600843edb13aed10b09c7cd55eda4" dependencies = [ "futures", "iced_core", @@ -1772,10 +1738,24 @@ dependencies = [ "wasm-timer", ] +[[package]] +name = "iced_glyphon" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c3bb56f1820ca252bc1d0994ece33d233a55657c0c263ea7cb16895adbde82" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "rustc-hash 2.0.0", + "wgpu", +] + [[package]] name = "iced_graphics" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#2e3082d6651d35a8239d19ab745507e1553e2ab1" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba25a18cfa6d5cc160aca7e1b34f73ccdff21680fa8702168c09739767b6c66f" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -1794,8 +1774,9 @@ dependencies = [ [[package]] name = "iced_renderer" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#2e3082d6651d35a8239d19ab745507e1553e2ab1" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73558208059f9e622df2bf434e044ee2f838ce75201a023cf0ca3e1244f46c2a" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -1806,8 +1787,9 @@ dependencies = [ [[package]] name = "iced_runtime" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#2e3082d6651d35a8239d19ab745507e1553e2ab1" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f72474ab379b1c53f4ec5e468c66f8e307f8db13c865c2714d2c4a4a5b38c9a1" dependencies = [ "bytes", "iced_core", @@ -1818,8 +1800,9 @@ dependencies = [ [[package]] name = "iced_tiny_skia" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#2e3082d6651d35a8239d19ab745507e1553e2ab1" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c625d368284fcc43b0b36b176f76eff1abebe7959dd58bd8ce6897d641962a50" dependencies = [ "bytemuck", "cosmic-text", @@ -1833,15 +1816,16 @@ dependencies = [ [[package]] name = "iced_wgpu" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#2e3082d6651d35a8239d19ab745507e1553e2ab1" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8194d7666004b8e947f89ab7446d323ab0b882971226c1913ef98764c9e4bbc4" dependencies = [ "bitflags 2.6.0", "bytemuck", "futures", "glam", - "glyphon", "guillotiere", + "iced_glyphon", "iced_graphics", "log", "lyon", @@ -1853,8 +1837,9 @@ dependencies = [ [[package]] name = "iced_widget" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#2e3082d6651d35a8239d19ab745507e1553e2ab1" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e88dd57d414cc44427c523534b80e52a42b6828f0e27ad7b8478f839865ee3c" dependencies = [ "iced_renderer", "iced_runtime", @@ -1867,8 +1852,9 @@ dependencies = [ [[package]] name = "iced_winit" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#2e3082d6651d35a8239d19ab745507e1553e2ab1" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f44cd4e1c594b6334f409282937bf972ba14d31fedf03c23aa595d982a2fda28" dependencies = [ "iced_futures", "iced_graphics", @@ -3239,14 +3225,14 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7555fcb4f753d095d734fdefebb0ad8c98478a21db500492d87c55913d3b0086" +checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" dependencies = [ "ab_glyph", "log", "memmap2", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "tiny-skia", ] @@ -3359,31 +3345,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "smithay-client-toolkit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" -dependencies = [ - "bitflags 2.6.0", - "calloop 0.12.4", - "calloop-wayland-source 0.2.0", - "cursor-icon", - "libc", - "log", - "memmap2", - "rustix", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr 0.2.0", - "wayland-scanner", - "xkeysym", -] - [[package]] name = "smithay-client-toolkit" version = "0.19.2" @@ -3391,8 +3352,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ "bitflags 2.6.0", - "calloop 0.13.0", - "calloop-wayland-source 0.3.0", + "calloop", + "calloop-wayland-source", "cursor-icon", "libc", "log", @@ -3403,8 +3364,8 @@ dependencies = [ "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.32.4", - "wayland-protocols-wlr 0.3.4", + "wayland-protocols", + "wayland-protocols-wlr", "wayland-scanner", "xkeysym", ] @@ -3416,7 +3377,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" dependencies = [ "libc", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "wayland-backend", ] @@ -3979,18 +3940,6 @@ dependencies = [ "xcursor", ] -[[package]] -name = "wayland-protocols" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - [[package]] name = "wayland-protocols" version = "0.32.4" @@ -4005,27 +3954,14 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.31.2", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.2.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +checksum = "8a0a41a6875e585172495f7a96dfa42ca7e0213868f4f15c313f7c33221a7eff" dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-scanner", ] @@ -4038,7 +3974,7 @@ dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.4", + "wayland-protocols", "wayland-scanner", ] @@ -4507,8 +4443,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.30.1" -source = "git+https://github.com/iced-rs/winit.git?rev=254d6b3420ce4e674f516f7a2bd440665e05484d#254d6b3420ce4e674f516f7a2bd440665e05484d" +version = "0.30.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67" dependencies = [ "ahash 0.8.11", "android-activity", @@ -4516,7 +4453,7 @@ dependencies = [ "bitflags 2.6.0", "block2", "bytemuck", - "calloop 0.12.4", + "calloop", "cfg_aliases 0.2.1", "concurrent-queue", "core-foundation 0.9.4", @@ -4538,7 +4475,7 @@ dependencies = [ "redox_syscall 0.4.1", "rustix", "sctk-adwaita", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "smol_str", "tracing", "unicode-segmentation", @@ -4546,7 +4483,7 @@ dependencies = [ "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-protocols-plasma", "web-sys", "web-time", diff --git a/Cargo.toml b/Cargo.toml index 64b935c..612db56 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,8 +13,7 @@ keywords = ["guitar", "tablature", "music"] [dependencies] nom = "7.1.3" encoding_rs = "0.8.34" -# TODO switch to 0.13 release when available -iced = { git = "https://github.com/iced-rs/iced.git", features = ["advanced", "canvas", "tokio", "debug"] } +iced = { version = "0.13.0", features = ["advanced", "canvas", "tokio", "debug"] } tokio = { version = "1.40.0", features = ["fs", "sync"] } rfd = "0.14.1" log = "0.4.22"