Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update egui to 0.30 and Rust to 1.80 #69

Merged
merged 6 commits into from
Dec 17, 2024
Merged

Update egui to 0.30 and Rust to 1.80 #69

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
11ee360
Update egui to 0.30 and Rust to 1.80
abey79 Dec 16, 2024
894e156
Enable `syn` feature `full`
abey79 Dec 16, 2024
14a0e9d
Pin `home` to 0.5.9
abey79 Dec 16, 2024
4da3ce8
Pin `home` to 0.5.9 correctly
abey79 Dec 16, 2024
371f3c2
add x11 and wayload features to eframe
abey79 Dec 16, 2024
4590630
revert adding the `full` feature to syn
abey79 Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
3 changes: 2 additions & 1 deletion egui_commonmark/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion egui_commonmark_macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ include = ["src/**/*.rs", "LICENSE-MIT", "LICENSE-APACHE", "Cargo.toml"]
proc-macro = true

[dependencies]
syn = "2"
syn = { version = "2", features = ["full"] }
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this feature enabled?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the macro crate would no longer compile after bumping egui version. The error message suggested to add the full feature, which did fix the compilation error. I didn't think any further about this, but I can look into it if needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well it seems that it's not actually needed. Not sure what went on—let me revert that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. CI seems happy 👍🏻

quote = { version = "1", default-features = false }
proc-macro2 = { version = "1", default-features = false }

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.76.0"
channel = "1.80.0"
components = ["rustfmt", "clippy"]
Loading