From 620c3652f905d0d19131505b2360fcbd853d8c30 Mon Sep 17 00:00:00 2001 From: Antoine Beyeler <49431240+abey79@users.noreply.github.com> Date: Tue, 17 Dec 2024 17:46:17 +0100 Subject: [PATCH] Update egui to 0.30 and Rust to 1.80 (#69) * Update egui to 0.30 and Rust to 1.80 * Enable `syn` feature `full` * Pin `home` to 0.5.9 * Pin `home` to 0.5.9 correctly * add x11 and wayload features to eframe * revert adding the `full` feature to syn --- Cargo.toml | 6 +++--- egui_commonmark/Cargo.toml | 3 ++- rust-toolchain | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c5f4631..1d9cd92 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,13 +11,13 @@ resolver = "2" [workspace.package] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.76" # Follows egui +rust-version = "1.80" # Follows egui version = "0.18.0" repository = "https://github.com/lampsitter/egui_commonmark" [workspace.dependencies] -egui_extras = { version = "0.29", default-features = false } -egui = { version = "0.29", default-features = false } +egui_extras = { version = "0.30", default-features = false } +egui = { version = "0.30", default-features = false } egui_commonmark_backend = { version = "0.18.0", path = "egui_commonmark_backend", default-features = false } egui_commonmark_macros = { version = "0.18.0", path = "egui_commonmark_macros", default-features = false } diff --git a/egui_commonmark/Cargo.toml b/egui_commonmark/Cargo.toml index a5da942..7cd0ffb 100644 --- a/egui_commonmark/Cargo.toml +++ b/egui_commonmark/Cargo.toml @@ -66,9 +66,10 @@ fetch = ["egui_extras/http"] embedded_image = ["egui_commonmark_backend/embedded_image"] [dev-dependencies] -eframe = { version = "0.29", default-features = false, features = ["default_fonts", "glow"] } +eframe = { version = "0.30", default-features = false, features = ["default_fonts", "glow", "wayland", "x11"] } image = { version = "0.25", default-features = false, features = ["png"] } egui_commonmark_macros = { workspace = true } # Tests won't build otherswise +home = "=0.5.9" # pinned for Rust 1.80.0, keep in sync with eframe [package.metadata.docs.rs] features = ["better_syntax_highlighting", "document-features", "macros"] diff --git a/rust-toolchain b/rust-toolchain index a436857..85cb9e7 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "1.76.0" +channel = "1.80.0" components = ["rustfmt", "clippy"]