diff --git a/.cargo/config.toml b/.cargo/config.toml index 1d940b5c047..b663243b9ac 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -9,11 +9,11 @@ rustflags = [ "-Wclippy::checked_conversions", "-Wclippy::dbg_macro", "-Wclippy::debug_assert_with_mut_call", - "-Wclippy::disallowed_method", + "-Wclippy::disallowed_methods", "-Wclippy::doc_markdown", "-Wclippy::empty_enum", "-Wclippy::enum_glob_use", - # "-Wclippy::equatable_if_let", // Enable when we update MSRV + "-Wclippy::equatable_if_let", "-Wclippy::exit", "-Wclippy::expl_impl_clone_on_copy", "-Wclippy::explicit_deref_methods", @@ -29,7 +29,7 @@ rustflags = [ "-Wclippy::imprecise_flops", "-Wclippy::inefficient_to_string", "-Wclippy::invalid_upcast_comparisons", - # "-Wclippy::iter_not_returning_iterator", // Enable when we update MSRV + "-Wclippy::iter_not_returning_iterator", "-Wclippy::large_digit_groups", "-Wclippy::large_stack_arrays", "-Wclippy::large_types_passed_by_value", diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index dea8320b14a..81be5edea2b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -18,7 +18,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.56.0 + toolchain: 1.60.0 override: true - run: sudo apt-get update && sudo apt-get install libspeechd-dev - uses: actions-rs/cargo@v1 @@ -33,7 +33,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.56.0 + toolchain: 1.60.0 override: true - run: sudo apt-get update && sudo apt-get install libspeechd-dev - uses: actions-rs/cargo@v1 @@ -49,7 +49,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.56.0 + toolchain: 1.60.0 override: true - run: rustup target add wasm32-unknown-unknown - uses: actions-rs/cargo@v1 @@ -65,7 +65,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.56.0 + toolchain: 1.60.0 override: true - name: check run: cargo check -p egui_demo_app @@ -78,7 +78,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.56.0 + toolchain: 1.60.0 override: true - run: rustup target add wasm32-unknown-unknown - name: check @@ -92,7 +92,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.56.0 + toolchain: 1.60.0 override: true - run: rustup target add wasm32-unknown-unknown - uses: actions-rs/cargo@v1 @@ -108,7 +108,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.56.0 + toolchain: 1.60.0 override: true - run: sudo apt-get update && sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libspeechd-dev libxkbcommon-dev libssl-dev libgtk-3-dev # libgtk-3-dev is used by rfd - uses: actions-rs/cargo@v1 @@ -124,7 +124,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.56.0 + toolchain: 1.60.0 override: true - run: rustup component add rustfmt - uses: actions-rs/cargo@v1 @@ -140,7 +140,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.56.0 + toolchain: 1.60.0 override: true - run: rustup component add clippy - run: sudo apt-get update && sudo apt-get install libspeechd-dev libgtk-3-dev # libgtk-3-dev is used by rfd @@ -157,7 +157,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.56.0 + toolchain: 1.60.0 override: true - run: sudo apt-get update && sudo apt-get install libspeechd-dev - run: cargo doc -p emath -p epaint -p egui -p eframe -p epi -p egui_web -p egui-winit -p egui_extras -p egui_glium -p egui_glow --lib --no-deps --all-features @@ -170,7 +170,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.56.0 + toolchain: 1.60.0 override: true - run: sudo apt-get update && sudo apt-get install libspeechd-dev - run: rustup target add wasm32-unknown-unknown @@ -190,7 +190,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.56.0 + toolchain: 1.60.0 override: true - run: rustup target add wasm32-unknown-unknown - run: cargo install wasm-bindgen-cli diff --git a/CHANGELOG.md b/CHANGELOG.md index e21d30fa7d4..f6a03b2dad2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,9 @@ NOTE: [`epaint`](epaint/CHANGELOG.md), [`eframe`](eframe/CHANGELOG.md), [`egui_w * Warnings will pe painted on screen when there is an `Id` clash for `Grid`, `Plot` or `ScrollArea` ([#1452](https://github.com/emilk/egui/pull/1452)). * `Checkbox` and `RadioButton` with an empty label (`""`) will now take up much less space ([#1456](https://github.com/emilk/egui/pull/1456)). * Replaced `Memory::top_most_layer` with more flexible `Memory::layer_ids`. +* MSRV (Minimum Supported Rust Version) is now `1.60.0` ([#1467](https://github.com/emilk/egui/pull/1467)). +* Renamed the feature `convert_bytemuck` to `bytemuck` ([#1467](https://github.com/emilk/egui/pull/1467)). +* Renamed the feature `serialize` to `serde` ([#1467](https://github.com/emilk/egui/pull/1467)). ### Fixed 🐛 * Fixed ComboBoxes always being rendered left-aligned ([#1304](https://github.com/emilk/egui/pull/1304)). diff --git a/eframe/CHANGELOG.md b/eframe/CHANGELOG.md index 8c053f76455..1646e51f9f7 100644 --- a/eframe/CHANGELOG.md +++ b/eframe/CHANGELOG.md @@ -21,6 +21,7 @@ NOTE: [`egui_web`](../egui_web/CHANGELOG.md), [`egui-winit`](../egui-winit/CHANG * Add `glow` (OpenGL) context to `Frame` ([#1425](https://github.com/emilk/egui/pull/1425)). * `dark-light` (dark mode detection) is now an opt-in feature ([#1437](https://github.com/emilk/egui/pull/1437)). * Fixed potential scale bug when DPI scaling changes (e.g. when dragging a window between different displays) ([#1441](https://github.com/emilk/egui/pull/1441)). +* MSRV (Minimum Supported Rust Version) is now `1.60.0` ([#1467](https://github.com/emilk/egui/pull/1467)). ## 0.17.0 - 2022-02-22 diff --git a/eframe/Cargo.toml b/eframe/Cargo.toml index f1a50935f55..bc9b5976b0a 100644 --- a/eframe/Cargo.toml +++ b/eframe/Cargo.toml @@ -4,7 +4,7 @@ version = "0.17.0" authors = ["Emil Ernerfeldt "] description = "egui framework - write GUI apps that compiles to web and/or natively" edition = "2021" -rust-version = "1.56" +rust-version = "1.60" homepage = "https://github.com/emilk/egui/tree/master/eframe" license = "MIT OR Apache-2.0" readme = "README.md" @@ -28,8 +28,8 @@ default_fonts = ["egui/default_fonts"] # Enable saving app state to disk. persistence = [ - # we cannot touch egui_glium or egui_glow here due to https://github.com/rust-lang/cargo/issues/8832 "egui-winit/persistence", + "egui_glow/persistence", "egui/persistence", "epi/file_storage", "epi/persistence", @@ -37,12 +37,12 @@ persistence = [ # enable screen reader support (requires `ctx.options().screen_reader = true;`) screen_reader = [ - # we cannot touch egui_glium or egui_glow here due to https://github.com/rust-lang/cargo/issues/8832 "egui-winit/screen_reader", + "egui_glow/screen_reader", "egui_web/screen_reader", ] -dark-light = [ "egui-winit/dark-light"] # detect dark mode system preference +dark-light = ["egui-winit/dark-light"] # detect dark mode system preference [dependencies] diff --git a/egui-winit/CHANGELOG.md b/egui-winit/CHANGELOG.md index e030432e570..296191f13eb 100644 --- a/egui-winit/CHANGELOG.md +++ b/egui-winit/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to the `egui-winit` integration will be noted in this file. ## Unreleased * Reexport `egui` crate +* Renamed the feature `convert_bytemuck` to `bytemuck` ([#1467](https://github.com/emilk/egui/pull/1467)). +* Renamed the feature `serialize` to `serde` ([#1467](https://github.com/emilk/egui/pull/1467)). +* MSRV (Minimum Supported Rust Version) is now `1.60.0` ([#1467](https://github.com/emilk/egui/pull/1467)). ## 0.17.0 - 2022-02-22 diff --git a/egui-winit/Cargo.toml b/egui-winit/Cargo.toml index c27d9cca845..692f8c14bc7 100644 --- a/egui-winit/Cargo.toml +++ b/egui-winit/Cargo.toml @@ -4,7 +4,7 @@ version = "0.17.0" authors = ["Emil Ernerfeldt "] description = "Bindings for using egui with winit" edition = "2021" -rust-version = "1.56" +rust-version = "1.60" homepage = "https://github.com/emilk/egui/tree/master/egui-winit" license = "MIT OR Apache-2.0" readme = "README.md" @@ -25,7 +25,7 @@ default = ["clipboard", "dark-light", "links"] clipboard = ["copypasta"] # implement bytemuck on most types. -convert_bytemuck = ["egui/convert_bytemuck"] +bytemuck = ["egui/bytemuck"] # Only for `egui_glow` - the official eframe/epi backend. epi_backend = ["epi", "glow"] @@ -36,11 +36,8 @@ links = ["webbrowser"] # experimental support for a screen reader screen_reader = ["tts"] -persistence = [ - "egui/serialize", - "serde", -] # can't add epi/persistence here because of https://github.com/rust-lang/cargo/issues/8832 -serialize = ["egui/serialize", "serde"] +persistence = ["egui/serde", "serde", "epi?/persistence"] +serde = ["egui/serde", "dep:serde"] [dependencies] @@ -51,6 +48,7 @@ instant = { version = "0.1", features = ["wasm-bindgen"] } tracing = "0.1" winit = "0.26.1" +# Optional: epi = { version = "0.17.0", path = "../epi", optional = true } copypasta = { version = "0.7", optional = true } diff --git a/egui-winit/src/screen_reader.rs b/egui-winit/src/screen_reader.rs index e3ac02b1aca..87ac204e8e0 100644 --- a/egui-winit/src/screen_reader.rs +++ b/egui-winit/src/screen_reader.rs @@ -4,6 +4,7 @@ pub struct ScreenReader { } #[cfg(not(feature = "screen_reader"))] +#[allow(clippy::derivable_impls)] // False positive impl Default for ScreenReader { fn default() -> Self { Self {} diff --git a/egui/Cargo.toml b/egui/Cargo.toml index b51c8e70028..bc31c39d32a 100644 --- a/egui/Cargo.toml +++ b/egui/Cargo.toml @@ -4,7 +4,7 @@ version = "0.17.0" authors = ["Emil Ernerfeldt "] description = "An easy-to-use immediate mode GUI that runs on both web and native" edition = "2021" -rust-version = "1.56" +rust-version = "1.60" homepage = "https://github.com/emilk/egui" license = "MIT OR Apache-2.0" readme = "../README.md" @@ -26,7 +26,7 @@ default = ["default_fonts"] cint = ["epaint/cint"] # implement bytemuck on most types. -convert_bytemuck = ["epaint/convert_bytemuck"] +bytemuck = ["epaint/bytemuck"] # If set, egui will use `include_bytes!` to bundle some fonts. # If you plan on specifying your own fonts you may disable this feature. @@ -41,10 +41,10 @@ extra_asserts = ["epaint/extra_asserts"] mint = ["epaint/mint"] # enable persistence of memory (window positions etc). -persistence = ["serde", "epaint/serialize", "ron"] +persistence = ["serde", "epaint/serde", "ron"] # implement serde on most types. -serialize = ["serde", "epaint/serialize"] +serde = ["dep:serde", "epaint/serde"] [dependencies] diff --git a/egui/src/lib.rs b/egui/src/lib.rs index 24c9de4be92..9c454511d24 100644 --- a/egui/src/lib.rs +++ b/egui/src/lib.rs @@ -3,7 +3,7 @@ //! Try the live web demo: . Read more about egui at . //! //! `egui` is in heavy development, with each new version having breaking changes. -//! You need to have rust 1.56.0 or later to use `egui`. +//! You need to have rust 1.60.0 or later to use `egui`. //! //! To quickly get started with egui, you can take a look at [`eframe_template`](https://github.com/emilk/eframe_template) //! which uses [`eframe`](https://docs.rs/eframe). diff --git a/egui_demo_app/Cargo.toml b/egui_demo_app/Cargo.toml index 6bcda1407da..49144ef3a60 100644 --- a/egui_demo_app/Cargo.toml +++ b/egui_demo_app/Cargo.toml @@ -4,7 +4,7 @@ version = "0.17.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.56" +rust-version = "1.60" publish = false [package.metadata.docs.rs] diff --git a/egui_demo_lib/Cargo.toml b/egui_demo_lib/Cargo.toml index 41e2237e72f..94dd975a9df 100644 --- a/egui_demo_lib/Cargo.toml +++ b/egui_demo_lib/Cargo.toml @@ -4,7 +4,7 @@ version = "0.17.0" authors = ["Emil Ernerfeldt "] description = "Example library for egui" edition = "2021" -rust-version = "1.56" +rust-version = "1.60" homepage = "https://github.com/emilk/egui/tree/master/egui_demo_lib" license = "MIT OR Apache-2.0" readme = "README.md" @@ -35,7 +35,7 @@ persistence = [ "egui_extras/persistence", "serde", ] -serialize = ["egui/serialize", "serde"] +serde = ["egui/serde", "dep:serde"] syntax_highlighting = ["syntect"] diff --git a/egui_extras/CHANGELOG.md b/egui_extras/CHANGELOG.md index 986f1f90e1b..11da8bab344 100644 --- a/egui_extras/CHANGELOG.md +++ b/egui_extras/CHANGELOG.md @@ -4,6 +4,7 @@ All notable changes to the `egui_extras` integration will be noted in this file. ## Unreleased * Added `Strip`, `Table` and `DatePicker` ([#963](https://github.com/emilk/egui/pull/963)). +* MSRV (Minimum Supported Rust Version) is now `1.60.0` ([#1467](https://github.com/emilk/egui/pull/1467)). ## 0.17.0 - 2022-02-22 diff --git a/egui_extras/Cargo.toml b/egui_extras/Cargo.toml index 172dbbddffe..5b3dcb31346 100644 --- a/egui_extras/Cargo.toml +++ b/egui_extras/Cargo.toml @@ -8,7 +8,7 @@ authors = [ ] description = "Extra functionality and widgets for the egui GUI library" edition = "2021" -rust-version = "1.56" +rust-version = "1.60" homepage = "https://github.com/emilk/egui" license = "MIT OR Apache-2.0" readme = "../README.md" diff --git a/egui_glium/CHANGELOG.md b/egui_glium/CHANGELOG.md index 6f8cbd8c4ae..7a1148c7def 100644 --- a/egui_glium/CHANGELOG.md +++ b/egui_glium/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to the `egui_glium` integration will be noted in this file. ## Unreleased * Remove "epi" feature ([#1361](https://github.com/emilk/egui/pull/1361)). * Remove need for `trait epi::NativeTexture` to use the `fn register_native_texture/replace_native_texture` ([#1361](https://github.com/emilk/egui/pull/1361)). +* MSRV (Minimum Supported Rust Version) is now `1.60.0` ([#1467](https://github.com/emilk/egui/pull/1467)). ## 0.17.0 - 2022-02-22 diff --git a/egui_glium/Cargo.toml b/egui_glium/Cargo.toml index 8ef557917d0..033f6725fc8 100644 --- a/egui_glium/Cargo.toml +++ b/egui_glium/Cargo.toml @@ -4,7 +4,7 @@ version = "0.17.0" authors = ["Emil Ernerfeldt "] description = "Bindings for using egui natively using the glium library" edition = "2021" -rust-version = "1.56" +rust-version = "1.60" homepage = "https://github.com/emilk/egui/tree/master/egui_glium" license = "MIT OR Apache-2.0" readme = "README.md" @@ -46,7 +46,7 @@ screen_reader = ["egui-winit/screen_reader"] [dependencies] egui = { version = "0.17.0", path = "../egui", default-features = false, features = [ - "convert_bytemuck", + "bytemuck", ] } egui-winit = { version = "0.17.0", path = "../egui-winit", default-features = false } diff --git a/egui_glow/CHANGELOG.md b/egui_glow/CHANGELOG.md index 436f2e5135d..a2852125860 100644 --- a/egui_glow/CHANGELOG.md +++ b/egui_glow/CHANGELOG.md @@ -7,6 +7,8 @@ All notable changes to the `egui_glow` integration will be noted in this file. * Add new `NativeOptions`: `vsync`, `multisampling`, `depth_buffer`, `stencil_buffer`. * `dark-light` (dark mode detection) is now an opt-in feature ([#1437](https://github.com/emilk/egui/pull/1437)). * Fixed potential scale bug when DPI scaling changes (e.g. when dragging a window between different displays) ([#1441](https://github.com/emilk/egui/pull/1441)). +* MSRV (Minimum Supported Rust Version) is now `1.60.0` ([#1467](https://github.com/emilk/egui/pull/1467)). +* `clipboard`, `links`, `persistence`, `winit` are now all opt-in features ([#1467](https://github.com/emilk/egui/pull/1467)). ## 0.17.0 - 2022-02-22 diff --git a/egui_glow/Cargo.toml b/egui_glow/Cargo.toml index 3d62c53e76d..01c0d73f647 100644 --- a/egui_glow/Cargo.toml +++ b/egui_glow/Cargo.toml @@ -4,7 +4,7 @@ version = "0.17.0" authors = ["Emil Ernerfeldt "] description = "Bindings for using egui natively using the glow library" edition = "2021" -rust-version = "1.56" +rust-version = "1.60" homepage = "https://github.com/emilk/egui/tree/master/egui_glow" license = "MIT OR Apache-2.0" readme = "README.md" @@ -24,7 +24,7 @@ all-features = true [features] -default = ["clipboard", "default_fonts", "links", "persistence", "winit"] +default = ["default_fonts"] # enable cut/copy/paste to OS clipboard. # if disabled a clipboard will be simulated so you can still copy/paste within the egui app. @@ -41,9 +41,8 @@ links = ["egui-winit/links"] persistence = [ "egui-winit/persistence", "egui/persistence", - "epi", # also implied by the lines below, see https://github.com/rust-lang/cargo/issues/8832 - "epi/file_storage", - "epi/persistence", + "epi?/file_storage", + "epi?/persistence", ] # experimental support for a screen reader @@ -53,12 +52,12 @@ screen_reader = ["egui-winit/screen_reader"] # if you want to use glow painter on web disable this feature. winit = ["egui-winit", "glutin"] -dark-light = ["egui-winit/dark-light"] # detect dark mode system preference +dark-light = ["egui-winit/dark-light"] # detect dark mode system preference [dependencies] egui = { version = "0.17.0", path = "../egui", default-features = false, features = [ - "convert_bytemuck", + "bytemuck", ] } epi = { version = "0.17.0", path = "../epi", optional = true } @@ -67,12 +66,14 @@ glow = "0.11" memoffset = "0.6" tracing = "0.1" +# Native: [target.'cfg(not(target_arch = "wasm32"))'.dependencies] egui-winit = { version = "0.17.0", path = "../egui-winit", optional = true, default-features = false, features = [ "epi_backend", ] } glutin = { version = "0.28.0", optional = true } +# Web: [target.'cfg(target_arch = "wasm32")'.dependencies] web-sys = { version = "0.3", features = ["console"] } wasm-bindgen = { version = "0.2" } diff --git a/egui_web/CHANGELOG.md b/egui_web/CHANGELOG.md index c3abab06795..5644cdb4263 100644 --- a/egui_web/CHANGELOG.md +++ b/egui_web/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to the `egui_web` integration will be noted in this file. * egui code will no longer be called after panic ([#1306](https://github.com/emilk/egui/pull/1306)). * Remove the "webgl" feature. `egui_web` now always use `glow` (which in turn wraps WebGL) ([#1356](https://github.com/emilk/egui/pull/1356)). * Use full browser width by default ([#1378](https://github.com/emilk/egui/pull/1378)). +* MSRV (Minimum Supported Rust Version) is now `1.60.0` ([#1467](https://github.com/emilk/egui/pull/1467)). ## 0.17.0 - 2022-02-22 diff --git a/egui_web/Cargo.toml b/egui_web/Cargo.toml index 7f9b09fc9f0..950a65a1f1c 100644 --- a/egui_web/Cargo.toml +++ b/egui_web/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Emil Ernerfeldt "] description = "Bindings for compiling egui code to WASM for a web page" license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.56" +rust-version = "1.60" homepage = "https://github.com/emilk/egui/tree/master/egui_web" readme = "README.md" repository = "https://github.com/emilk/egui/tree/master/egui_web" @@ -42,7 +42,7 @@ screen_reader = ["tts"] [dependencies] egui = { version = "0.17.0", path = "../egui", default-features = false, features = [ - "convert_bytemuck", + "bytemuck", "tracing", ] } egui_glow = { version = "0.17.0", path = "../egui_glow", default-features = false } diff --git a/egui_web/src/screen_reader.rs b/egui_web/src/screen_reader.rs index e3ac02b1aca..87ac204e8e0 100644 --- a/egui_web/src/screen_reader.rs +++ b/egui_web/src/screen_reader.rs @@ -4,6 +4,7 @@ pub struct ScreenReader { } #[cfg(not(feature = "screen_reader"))] +#[allow(clippy::derivable_impls)] // False positive impl Default for ScreenReader { fn default() -> Self { Self {} diff --git a/emath/Cargo.toml b/emath/Cargo.toml index 4fd3afc7531..45f4d3c5904 100644 --- a/emath/Cargo.toml +++ b/emath/Cargo.toml @@ -4,7 +4,7 @@ version = "0.17.0" authors = ["Emil Ernerfeldt "] description = "Minimal 2D math library for GUI work" edition = "2021" -rust-version = "1.56" +rust-version = "1.60" homepage = "https://github.com/emilk/egui/tree/master/emath" license = "MIT OR Apache-2.0" readme = "README.md" @@ -29,6 +29,7 @@ extra_asserts = [] [dependencies] +# Optional: bytemuck = { version = "1.7.2", optional = true, features = ["derive"] } mint = { version = "0.5.6", optional = true } serde = { version = "1", optional = true, features = ["derive"] } diff --git a/epaint/CHANGELOG.md b/epaint/CHANGELOG.md index 94f1c8ca641..9a3c3740685 100644 --- a/epaint/CHANGELOG.md +++ b/epaint/CHANGELOG.md @@ -18,6 +18,9 @@ All notable changes to the epaint crate will be documented in this file. * Dark text is darker and more readable on bright backgrounds ([#1412](https://github.com/emilk/egui/pull/1412)). * Fix panic when tessellating a [`Shape::Vec`] containing meshes with differing `TextureId`:s ([#1445](https://github.com/emilk/egui/pull/1445)). * Added `Shape::galley_with_color` which adds the functionality of `Painter::galley_with_color` into the Shape enum. ([#1461](https://github.com/emilk/egui/pull/1461)) +* MSRV (Minimum Supported Rust Version) is now `1.60.0` ([#1467](https://github.com/emilk/egui/pull/1467)). +* Renamed the feature `convert_bytemuck` to `bytemuck` ([#1467](https://github.com/emilk/egui/pull/1467)). +* Renamed the feature `serialize` to `serde` ([#1467](https://github.com/emilk/egui/pull/1467)). ## 0.17.0 - 2022-02-22 diff --git a/epaint/Cargo.toml b/epaint/Cargo.toml index 5316397e055..9a6f62c136a 100644 --- a/epaint/Cargo.toml +++ b/epaint/Cargo.toml @@ -4,7 +4,7 @@ version = "0.17.0" authors = ["Emil Ernerfeldt "] description = "Minimal 2D graphics library for GUI work" edition = "2021" -rust-version = "1.56" +rust-version = "1.60" homepage = "https://github.com/emilk/egui/tree/master/epaint" license = "MIT OR Apache-2.0" readme = "README.md" @@ -30,7 +30,7 @@ all-features = true default = ["default_fonts"] # implement bytemuck on most types. -convert_bytemuck = ["bytemuck", "emath/bytemuck"] +bytemuck = ["dep:bytemuck", "emath/bytemuck"] # If set, epaint will use `include_bytes!` to bundle some fonts. # If you plan on specifying your own fonts you may disable this feature. @@ -45,17 +45,19 @@ extra_asserts = ["emath/extra_asserts"] mint = ["emath/mint"] # implement serde on most types. -serialize = ["serde", "ahash/serde", "emath/serde"] +serde = ["dep:serde", "ahash/serde", "emath/serde"] [dependencies] emath = { version = "0.17.0", path = "../emath" } ab_glyph = "0.2.11" +nohash-hasher = "0.2" + +# Optional: ahash = { version = "0.7", default-features = false, features = ["std"] } bytemuck = { version = "1.7.2", optional = true, features = ["derive"] } cint = { version = "^0.2.2", optional = true } -nohash-hasher = "0.2" serde = { version = "1", optional = true, features = ["derive", "rc"] } # native: diff --git a/epi/Cargo.toml b/epi/Cargo.toml index a62005eb0e4..7e3190f2479 100644 --- a/epi/Cargo.toml +++ b/epi/Cargo.toml @@ -4,7 +4,7 @@ version = "0.17.0" authors = ["Emil Ernerfeldt "] description = "Backend-agnostic interface for writing apps using egui" edition = "2021" -rust-version = "1.56" +rust-version = "1.60" homepage = "https://github.com/emilk/egui/tree/master/epi" license = "MIT OR Apache-2.0" readme = "README.md" @@ -32,6 +32,7 @@ egui = { version = "0.17.0", path = "../egui", default-features = false } glow = "0.11" tracing = "0.1" +# Optional: directories-next = { version = "2", optional = true } ron = { version = "0.7", optional = true } serde = { version = "1", optional = true } diff --git a/rust-toolchain b/rust-toolchain index 7e94f20b001..c03d9c48949 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -5,6 +5,6 @@ # to the user in the error, instead of "error: invalid channel name '[toolchain]'". [toolchain] -channel = "1.56.0" +channel = "1.60.0" components = [ "rustfmt", "clippy" ] targets = [ "wasm32-unknown-unknown" ]