From 8d6ad06a0dfed0a52876268ff0d94895a08286c9 Mon Sep 17 00:00:00 2001 From: Matt Campbell Date: Sat, 23 Jul 2022 06:11:50 -0500 Subject: [PATCH 1/3] Update to Rust 1.61.0 --- .github/workflows/rust.yml | 22 +++++++++++----------- CHANGELOG.md | 1 + eframe/CHANGELOG.md | 1 + eframe/Cargo.toml | 2 +- egui-wgpu/Cargo.toml | 2 +- egui-winit/CHANGELOG.md | 1 + egui-winit/Cargo.toml | 2 +- egui/Cargo.toml | 2 +- egui/src/lib.rs | 2 +- egui_demo_app/Cargo.toml | 2 +- egui_demo_lib/Cargo.toml | 2 +- egui_extras/CHANGELOG.md | 1 + egui_extras/Cargo.toml | 2 +- egui_glium/CHANGELOG.md | 1 + egui_glium/Cargo.toml | 2 +- egui_glow/CHANGELOG.md | 1 + egui_glow/Cargo.toml | 2 +- emath/Cargo.toml | 2 +- epaint/CHANGELOG.md | 1 + epaint/Cargo.toml | 2 +- examples/confirm_exit/Cargo.toml | 2 +- examples/custom_3d_glow/Cargo.toml | 2 +- examples/custom_3d_three-d/Cargo.toml | 2 +- examples/custom_font/Cargo.toml | 2 +- examples/custom_font_style/Cargo.toml | 2 +- examples/custom_window_frame/Cargo.toml | 2 +- examples/download_image/Cargo.toml | 2 +- examples/file_dialog/Cargo.toml | 2 +- examples/hello_world/Cargo.toml | 2 +- examples/puffin_profiler/Cargo.toml | 2 +- examples/retained_image/Cargo.toml | 2 +- examples/screenshot/Cargo.toml | 2 +- examples/svg/Cargo.toml | 2 +- rust-toolchain | 2 +- 34 files changed, 44 insertions(+), 37 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 87747f978c7..fb9f6723499 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.60.0 + toolchain: 1.61.0 override: true - name: Install packages (Linux) if: runner.os == 'Linux' @@ -39,7 +39,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.60.0 + toolchain: 1.61.0 override: true - name: Install packages (Linux) if: runner.os == 'Linux' @@ -57,7 +57,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.60.0 + toolchain: 1.61.0 override: true - run: rustup target add wasm32-unknown-unknown - uses: actions-rs/cargo@v1 @@ -73,7 +73,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.60.0 + toolchain: 1.61.0 override: true - name: check run: cargo check -p egui_demo_app @@ -86,7 +86,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.60.0 + toolchain: 1.61.0 override: true - run: rustup target add wasm32-unknown-unknown - name: check @@ -100,7 +100,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.60.0 + toolchain: 1.61.0 override: true - run: rustup target add wasm32-unknown-unknown - uses: actions-rs/cargo@v1 @@ -116,7 +116,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.60.0 + toolchain: 1.61.0 override: true - name: Install packages (Linux) if: runner.os == 'Linux' @@ -134,7 +134,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.60.0 + toolchain: 1.61.0 override: true - run: rustup component add rustfmt - uses: actions-rs/cargo@v1 @@ -150,7 +150,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.60.0 + toolchain: 1.61.0 override: true - run: cargo install cargo-cranky - name: Install packages (Linux) @@ -169,7 +169,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.60.0 + toolchain: 1.61.0 override: true - name: Install packages (Linux) if: runner.os == 'Linux' @@ -190,7 +190,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.60.0 + toolchain: 1.61.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 d19355e2edc..d7f210f805a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ NOTE: [`epaint`](epaint/CHANGELOG.md), [`eframe`](eframe/CHANGELOG.md), [`egui-w * `PaintCallback` shapes now require the whole callback to be put in an `Arc` with the value being a backend-specific callback type. ([#1684](https://github.com/emilk/egui/pull/1684)) * Replaced `needs_repaint` in `FullOutput` with `repaint_after`. Used to force repaint after the set duration in reactive mode.([#1694](https://github.com/emilk/egui/pull/1694)). * `Layout::left_to_right` and `Layout::right_to_left` now takes the vertical align as an argument. Previous default was `Align::Center`. +* MSRV (Minimum Supported Rust Version) is now `1.61.0` ([#1846](https://github.com/emilk/egui/pull/1846)). ### Fixed 🐛 * Fixed `ImageButton`'s changing background padding on hover ([#1595](https://github.com/emilk/egui/pull/1595)). diff --git a/eframe/CHANGELOG.md b/eframe/CHANGELOG.md index 4f40df08bb9..1e2e9bc8170 100644 --- a/eframe/CHANGELOG.md +++ b/eframe/CHANGELOG.md @@ -13,6 +13,7 @@ NOTE: [`egui-winit`](../egui-winit/CHANGELOG.md), [`egui_glium`](../egui_glium/C * Allow running on native without hardware accelerated rendering. Change with `NativeOptions::hardware_acceleration` ([#1681]([#1693](https://github.com/emilk/egui/pull/1693)). * `dark-light` (dark mode detection) is now enabled by default on Mac and Windows ([#1726](https://github.com/emilk/egui/pull/1726)). * Add `NativeOptions::follow_system_theme` and `NativeOptions::default_theme` ([#1726](https://github.com/emilk/egui/pull/1726)). +* MSRV (Minimum Supported Rust Version) is now `1.61.0` ([#1846](https://github.com/emilk/egui/pull/1846)). ## 0.18.0 - 2022-04-30 diff --git a/eframe/Cargo.toml b/eframe/Cargo.toml index 2e983d9ab66..191099bc0c6 100644 --- a/eframe/Cargo.toml +++ b/eframe/Cargo.toml @@ -4,7 +4,7 @@ version = "0.18.0" authors = ["Emil Ernerfeldt "] description = "egui framework - write GUI apps that compiles to web and/or natively" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" homepage = "https://github.com/emilk/egui/tree/master/eframe" license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/egui-wgpu/Cargo.toml b/egui-wgpu/Cargo.toml index ef3c04301f6..a6921642d8c 100644 --- a/egui-wgpu/Cargo.toml +++ b/egui-wgpu/Cargo.toml @@ -8,7 +8,7 @@ authors = [ "Emil Ernerfeldt ", ] edition = "2021" -rust-version = "1.60" +rust-version = "1.61" homepage = "https://github.com/emilk/egui/tree/master/egui-wgpu" license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/egui-winit/CHANGELOG.md b/egui-winit/CHANGELOG.md index 3838632613e..a1b5fe65cff 100644 --- a/egui-winit/CHANGELOG.md +++ b/egui-winit/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to the `egui-winit` integration will be noted in this file. ## Unreleased * Fix clipboard on Wayland ([#1613](https://github.com/emilk/egui/pull/1613)). * Allow deferred render + surface state initialization for Android ([#1634](https://github.com/emilk/egui/pull/1634)) +* MSRV (Minimum Supported Rust Version) is now `1.61.0` ([#1846](https://github.com/emilk/egui/pull/1846)). ## 0.18.0 - 2022-04-30 diff --git a/egui-winit/Cargo.toml b/egui-winit/Cargo.toml index e76a399e5ef..7a34c062178 100644 --- a/egui-winit/Cargo.toml +++ b/egui-winit/Cargo.toml @@ -4,7 +4,7 @@ version = "0.18.0" authors = ["Emil Ernerfeldt "] description = "Bindings for using egui with winit" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" homepage = "https://github.com/emilk/egui/tree/master/egui-winit" license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/egui/Cargo.toml b/egui/Cargo.toml index eea1e829252..10b1b73a45e 100644 --- a/egui/Cargo.toml +++ b/egui/Cargo.toml @@ -4,7 +4,7 @@ version = "0.18.1" authors = ["Emil Ernerfeldt "] description = "An easy-to-use immediate mode GUI that runs on both web and native" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" homepage = "https://github.com/emilk/egui" license = "MIT OR Apache-2.0" readme = "../README.md" diff --git a/egui/src/lib.rs b/egui/src/lib.rs index 278e1302844..45b3f56d73a 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.60.0 or later to use `egui`. +//! You need to have rust 1.61.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 a8955046820..0c9dde24a05 100644 --- a/egui_demo_app/Cargo.toml +++ b/egui_demo_app/Cargo.toml @@ -4,7 +4,7 @@ version = "0.18.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" publish = false default-run = "egui_demo_app" diff --git a/egui_demo_lib/Cargo.toml b/egui_demo_lib/Cargo.toml index 28fbc7ac269..baa14178a30 100644 --- a/egui_demo_lib/Cargo.toml +++ b/egui_demo_lib/Cargo.toml @@ -4,7 +4,7 @@ version = "0.18.0" authors = ["Emil Ernerfeldt "] description = "Example library for egui" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" homepage = "https://github.com/emilk/egui/tree/master/egui_demo_lib" license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/egui_extras/CHANGELOG.md b/egui_extras/CHANGELOG.md index 81db4ecc26d..886cbca6cbe 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 * You can now specify a texture filter for `RetainedImage` ([#1636](https://github.com/emilk/egui/pull/1636)). +* MSRV (Minimum Supported Rust Version) is now `1.61.0` ([#1846](https://github.com/emilk/egui/pull/1846)). ## 0.18.0 - 2022-04-30 diff --git a/egui_extras/Cargo.toml b/egui_extras/Cargo.toml index 1e4f32fe432..24258d2f16e 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.60" +rust-version = "1.61" 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 5d8ccd8ab9f..9971a954dd5 100644 --- a/egui_glium/CHANGELOG.md +++ b/egui_glium/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to the `egui_glium` integration will be noted in this file. ## Unreleased +* MSRV (Minimum Supported Rust Version) is now `1.61.0` ([#1846](https://github.com/emilk/egui/pull/1846)). ## 0.18.0 - 2022-04-30 diff --git a/egui_glium/Cargo.toml b/egui_glium/Cargo.toml index 83b5699974d..b4ea5457fe4 100644 --- a/egui_glium/Cargo.toml +++ b/egui_glium/Cargo.toml @@ -4,7 +4,7 @@ version = "0.18.0" authors = ["Emil Ernerfeldt "] description = "Bindings for using egui natively using the glium library" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" homepage = "https://github.com/emilk/egui/tree/master/egui_glium" license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/egui_glow/CHANGELOG.md b/egui_glow/CHANGELOG.md index 0fccbb55072..ad349d21638 100644 --- a/egui_glow/CHANGELOG.md +++ b/egui_glow/CHANGELOG.md @@ -4,6 +4,7 @@ All notable changes to the `egui_glow` integration will be noted in this file. ## Unreleased * `EguiGlow::new` now takes an `EventLoopWindowTarget` instead of a `winit::Window` ([#1634](https://github.com/emilk/egui/pull/1634)) +* MSRV (Minimum Supported Rust Version) is now `1.61.0` ([#1846](https://github.com/emilk/egui/pull/1846)). ## 0.18.1 - 2022-05-05 * Remove calls to `gl.get_error` in release builds to speed up rendering ([#1583](https://github.com/emilk/egui/pull/1583)). diff --git a/egui_glow/Cargo.toml b/egui_glow/Cargo.toml index 5bf226a0cc2..3d390637fc5 100644 --- a/egui_glow/Cargo.toml +++ b/egui_glow/Cargo.toml @@ -4,7 +4,7 @@ version = "0.18.1" authors = ["Emil Ernerfeldt "] description = "Bindings for using egui natively using the glow library" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" homepage = "https://github.com/emilk/egui/tree/master/egui_glow" license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/emath/Cargo.toml b/emath/Cargo.toml index 6918e2eeb9f..3f65ace49f7 100644 --- a/emath/Cargo.toml +++ b/emath/Cargo.toml @@ -4,7 +4,7 @@ version = "0.18.0" authors = ["Emil Ernerfeldt "] description = "Minimal 2D math library for GUI work" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" homepage = "https://github.com/emilk/egui/tree/master/emath" license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/epaint/CHANGELOG.md b/epaint/CHANGELOG.md index d7eabc53fc0..b331a99c9fb 100644 --- a/epaint/CHANGELOG.md +++ b/epaint/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to the epaint crate will be documented in this file. * Added `epaint::hex_color!` to create `Color32`'s from hex strings under the `color-hex` feature ([#1596](https://github.com/emilk/egui/pull/1596)). * Optimize tessellation of filled circles by 10x or more ([#1616](https://github.com/emilk/egui/pull/1616)). * Added opt-in feature `deadlock_detection` to detect double-lock of mutexes on the same thread ([#1619](https://github.com/emilk/egui/pull/1619)). +* MSRV (Minimum Supported Rust Version) is now `1.61.0` ([#1846](https://github.com/emilk/egui/pull/1846)). ## 0.18.1 - 2022-05-01 diff --git a/epaint/Cargo.toml b/epaint/Cargo.toml index f0dc45bf00b..9a33734e57e 100644 --- a/epaint/Cargo.toml +++ b/epaint/Cargo.toml @@ -4,7 +4,7 @@ version = "0.18.1" authors = ["Emil Ernerfeldt "] description = "Minimal 2D graphics library for GUI work" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" homepage = "https://github.com/emilk/egui/tree/master/epaint" license = "MIT OR Apache-2.0" readme = "README.md" diff --git a/examples/confirm_exit/Cargo.toml b/examples/confirm_exit/Cargo.toml index a6dee834381..79f0318fb3b 100644 --- a/examples/confirm_exit/Cargo.toml +++ b/examples/confirm_exit/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" publish = false diff --git a/examples/custom_3d_glow/Cargo.toml b/examples/custom_3d_glow/Cargo.toml index 645531b78a3..bbfa11284ba 100644 --- a/examples/custom_3d_glow/Cargo.toml +++ b/examples/custom_3d_glow/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" publish = false diff --git a/examples/custom_3d_three-d/Cargo.toml b/examples/custom_3d_three-d/Cargo.toml index d19f2c9be3e..277276471f4 100644 --- a/examples/custom_3d_three-d/Cargo.toml +++ b/examples/custom_3d_three-d/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" publish = false diff --git a/examples/custom_font/Cargo.toml b/examples/custom_font/Cargo.toml index 9c9bf122e2f..5a936f0013d 100644 --- a/examples/custom_font/Cargo.toml +++ b/examples/custom_font/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" publish = false diff --git a/examples/custom_font_style/Cargo.toml b/examples/custom_font_style/Cargo.toml index a3b7169f526..10374cf897d 100644 --- a/examples/custom_font_style/Cargo.toml +++ b/examples/custom_font_style/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["tami5 "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" publish = false diff --git a/examples/custom_window_frame/Cargo.toml b/examples/custom_window_frame/Cargo.toml index 93d8aecc4d2..13cc065162a 100644 --- a/examples/custom_window_frame/Cargo.toml +++ b/examples/custom_window_frame/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" publish = false diff --git a/examples/download_image/Cargo.toml b/examples/download_image/Cargo.toml index cbe5f7d7a3f..a284e661c9e 100644 --- a/examples/download_image/Cargo.toml +++ b/examples/download_image/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" publish = false diff --git a/examples/file_dialog/Cargo.toml b/examples/file_dialog/Cargo.toml index 74db8f27421..ebad4863e3a 100644 --- a/examples/file_dialog/Cargo.toml +++ b/examples/file_dialog/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" publish = false diff --git a/examples/hello_world/Cargo.toml b/examples/hello_world/Cargo.toml index c05147418f0..ea95b02165d 100644 --- a/examples/hello_world/Cargo.toml +++ b/examples/hello_world/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" publish = false diff --git a/examples/puffin_profiler/Cargo.toml b/examples/puffin_profiler/Cargo.toml index 2acf172ff10..4d683138591 100644 --- a/examples/puffin_profiler/Cargo.toml +++ b/examples/puffin_profiler/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" publish = false diff --git a/examples/retained_image/Cargo.toml b/examples/retained_image/Cargo.toml index fc647c41008..88c7d2fb456 100644 --- a/examples/retained_image/Cargo.toml +++ b/examples/retained_image/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" publish = false diff --git a/examples/screenshot/Cargo.toml b/examples/screenshot/Cargo.toml index aab4e6565e1..8f9fa0b4d6a 100644 --- a/examples/screenshot/Cargo.toml +++ b/examples/screenshot/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["René Rössler "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" publish = false diff --git a/examples/svg/Cargo.toml b/examples/svg/Cargo.toml index 0e2cdba3783..161b28cd378 100644 --- a/examples/svg/Cargo.toml +++ b/examples/svg/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["Emil Ernerfeldt "] license = "MIT OR Apache-2.0" edition = "2021" -rust-version = "1.60" +rust-version = "1.61" publish = false diff --git a/rust-toolchain b/rust-toolchain index c03d9c48949..818270c217a 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.60.0" +channel = "1.61.0" components = [ "rustfmt", "clippy" ] targets = [ "wasm32-unknown-unknown" ] From ddff06b73fbf630ec2672949041b200324695df2 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Tue, 26 Jul 2022 16:35:15 +0200 Subject: [PATCH 2/3] fix merge mistake --- egui_glow/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/egui_glow/CHANGELOG.md b/egui_glow/CHANGELOG.md index 449e1d338af..e0377191904 100644 --- a/egui_glow/CHANGELOG.md +++ b/egui_glow/CHANGELOG.md @@ -9,6 +9,7 @@ All notable changes to the `egui_glow` integration will be noted in this file. * Use `Arc` for `glow::Context` instead of `Rc` ([#1640](https://github.com/emilk/egui/pull/1640)). * Fixed `glClear` on WebGL1 ([#1658](https://github.com/emilk/egui/pull/1658)). + ## 0.18.1 - 2022-05-05 * Remove calls to `gl.get_error` in release builds to speed up rendering ([#1583](https://github.com/emilk/egui/pull/1583)). From 1fb56e6514a38f5ffdece9aa2723dad6f673a6d8 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Tue, 26 Jul 2022 16:35:24 +0200 Subject: [PATCH 3/3] fix merge mistake --- egui_glow/CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/egui_glow/CHANGELOG.md b/egui_glow/CHANGELOG.md index e0377191904..078145c4bc3 100644 --- a/egui_glow/CHANGELOG.md +++ b/egui_glow/CHANGELOG.md @@ -4,7 +4,6 @@ All notable changes to the `egui_glow` integration will be noted in this file. ## Unreleased * MSRV (Minimum Supported Rust Version) is now `1.61.0` ([#1846](https://github.com/emilk/egui/pull/1846)). -* `EguiGlow::new` now takes an `EventLoopWindowTarget` instead of a `winit::Window` ([#1634](https://github.com/emilk/egui/pull/1634)) * `EguiGlow::new` now takes an `EventLoopWindowTarget` instead of a `winit::Window` ([#1634](https://github.com/emilk/egui/pull/1634)). * Use `Arc` for `glow::Context` instead of `Rc` ([#1640](https://github.com/emilk/egui/pull/1640)). * Fixed `glClear` on WebGL1 ([#1658](https://github.com/emilk/egui/pull/1658)).