Set MSRV to 1.56.0 and use rust edition 2021 (#998)

.github/workflows/rust.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.54.0
+          toolchain: 1.56.0
           override: true
       - run: sudo apt-get update && sudo apt-get install libspeechd-dev
       - uses: actions-rs/cargo@v1
@@ -32,7 +32,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.54.0
+          toolchain: 1.56.0
           override: true
       - run: sudo apt-get update && sudo apt-get install libspeechd-dev
       - uses: actions-rs/cargo@v1
@@ -48,7 +48,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.54.0
+          toolchain: 1.56.0
           override: true
       - run: rustup target add wasm32-unknown-unknown
       - uses: actions-rs/cargo@v1
@@ -64,7 +64,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.54.0
+          toolchain: 1.56.0
           override: true
       - run: rustup target add wasm32-unknown-unknown
       - uses: actions-rs/cargo@v1
@@ -80,7 +80,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.54.0
+          toolchain: 1.56.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
@@ -96,7 +96,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.54.0
+          toolchain: 1.56.0
           override: true
       - run: rustup component add rustfmt
       - uses: actions-rs/cargo@v1
@@ -112,7 +112,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.54.0
+          toolchain: 1.56.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
@@ -129,7 +129,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.54.0
+          toolchain: 1.56.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_glium -p egui_glow --lib --no-deps --all-features
@@ -142,7 +142,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.54.0
+          toolchain: 1.56.0
           override: true
       - run: sudo apt-get update && sudo apt-get install libspeechd-dev
       - run: rustup target add wasm32-unknown-unknown

CHANGELOG.md

@@ -21,6 +21,7 @@ NOTE: [`epaint`](epaint/CHANGELOG.md), [`eframe`](eframe/CHANGELOG.md), [`egui_w
 * Add `Button::image_and_text` ([#832](https://github.com/emilk/egui/pull/832)).
 
 ### Changed 🔧
+* MSRV (Minimum Supported Rust Version) is now `1.56.0`.
 * `ui.add(Button::new("…").text_color(…))` is now `ui.button(RichText::new("…").color(…))` (same for `Label` )([#855](https://github.com/emilk/egui/pull/855)).
 * Plots now provide a `show` method that has to be used to add items to and show the plot ([#766](https://github.com/emilk/egui/pull/766)).
 * Replace `CtxRef::begin_frame` and `end_frame` with `CtxRef::run` ([#872](https://github.com/emilk/egui/pull/872)).

eframe/Cargo.toml

@@ -3,7 +3,8 @@ name = "eframe"
 version = "0.15.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 description = "egui framework - write GUI apps that compiles to web and/or natively"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 homepage = "https://github.com/emilk/egui/tree/master/eframe"
 license = "MIT OR Apache-2.0"
 readme = "README.md"

egui-winit/Cargo.toml

@@ -3,7 +3,8 @@ name = "egui-winit"
 version = "0.15.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 description = "Bindings for using egui with winit"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 homepage = "https://github.com/emilk/egui/tree/master/egui-winit"
 license = "MIT OR Apache-2.0"
 readme = "README.md"

egui-winit/src/epi.rs

@@ -292,9 +292,8 @@ impl EpiIntegration {
         }
         .build();
 
-        let app = &mut self.app; // TODO: remove when we update MSVR to 1.56
         let (egui_output, shapes) = self.egui_ctx.run(raw_input, |egui_ctx| {
-            app.update(egui_ctx, &mut frame);
+            self.app.update(egui_ctx, &mut frame);
         });
 
         let needs_repaint = egui_output.needs_repaint;

egui/Cargo.toml

@@ -3,7 +3,8 @@ name = "egui"
 version = "0.15.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 description = "Simple, portable immediate mode GUI library for Rust"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 homepage = "https://github.com/emilk/egui"
 license = "MIT OR Apache-2.0"
 readme = "../README.md"

egui/src/lib.rs

@@ -3,7 +3,7 @@
 //! Try the live web demo: <https://emilk.github.io/egui/index.html>. Read more about egui at <https://github.com/emilk/egui>.
 //!
 //! `egui` is in heavy development, with each new version having breaking changes.
-//! You need to have rust 1.54.0 or later to use `egui`.
+//! You need to have rust 1.56.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).

egui_demo_app/Cargo.toml

@@ -3,7 +3,8 @@ name = "egui_demo_app"
 version = "0.15.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 publish = false
 
 [lib]

egui_demo_lib/Cargo.toml

@@ -3,7 +3,8 @@ name = "egui_demo_lib"
 version = "0.15.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 description = "Example library for egui"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 homepage = "https://github.com/emilk/egui/tree/master/egui_demo_lib"
 license = "MIT OR Apache-2.0"
 readme = "README.md"

egui_glium/Cargo.toml

@@ -3,7 +3,8 @@ name = "egui_glium"
 version = "0.15.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 description = "Bindings for using egui natively using the glium library"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 homepage = "https://github.com/emilk/egui/tree/master/egui_glium"
 license = "MIT OR Apache-2.0"
 readme = "README.md"

egui_glow/Cargo.toml

@@ -3,7 +3,8 @@ name = "egui_glow"
 version = "0.15.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 description = "Bindings for using egui natively using the glow library"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 homepage = "https://github.com/emilk/egui/tree/master/egui_glow"
 license = "MIT OR Apache-2.0"
 readme = "README.md"

egui_web/Cargo.toml

@@ -4,7 +4,8 @@ version = "0.15.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 description = "Bindings for compiling egui code to WASM for a web page"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 homepage = "https://github.com/emilk/egui/tree/master/egui_web"
 readme = "README.md"
 repository = "https://github.com/emilk/egui/tree/master/egui_web"

egui_web/src/backend.rs

@@ -198,9 +198,8 @@ impl AppRunner {
         }
         .build();
 
-        let app = &mut self.app; // TODO: remove when we bump MSRV to 1.56
         let (egui_output, shapes) = self.egui_ctx.run(raw_input, |egui_ctx| {
-            app.update(egui_ctx, &mut frame);
+            self.app.update(egui_ctx, &mut frame);
         });
         let clipped_meshes = self.egui_ctx.tessellate(shapes);
 

emath/Cargo.toml

@@ -3,7 +3,8 @@ name = "emath"
 version = "0.15.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 description = "Minimal 2D math library for GUI work"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 homepage = "https://github.com/emilk/egui/tree/master/emath"
 license = "MIT OR Apache-2.0"
 readme = "README.md"

epaint/Cargo.toml

@@ -3,7 +3,8 @@ name = "epaint"
 version = "0.15.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 description = "Minimal 2D graphics library for GUI work"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 homepage = "https://github.com/emilk/egui/tree/master/epaint"
 license = "MIT OR Apache-2.0"
 readme = "README.md"

epaint/src/mesh.rs

@@ -64,7 +64,6 @@ impl Mesh {
 
     /// Are all indices within the bounds of the contained vertices?
     pub fn is_valid(&self) -> bool {
-        use std::convert::TryFrom;
         if let Ok(n) = u32::try_from(self.vertices.len()) {
             self.indices.iter().all(|&i| i < n)
         } else {
@@ -223,7 +222,6 @@ impl Mesh {
                 MAX_SIZE
             );
 
-            use std::convert::TryFrom;
             let mesh = Mesh16 {
                 indices: self.indices[span_start..index_cursor]
                     .iter()
@@ -267,7 +265,6 @@ pub struct Mesh16 {
 impl Mesh16 {
     /// Are all indices within the bounds of the contained vertices?
     pub fn is_valid(&self) -> bool {
-        use std::convert::TryFrom;
         if let Ok(n) = u16::try_from(self.vertices.len()) {
             self.indices.iter().all(|&i| i < n)
         } else {

epi/Cargo.toml

@@ -3,7 +3,8 @@ name = "epi"
 version = "0.15.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 description = "Backend-agnostic interface for writing apps using egui"
-edition = "2018"
+edition = "2021"
+rust-version = "1.56"
 homepage = "https://github.com/emilk/egui/tree/master/epi"
 license = "MIT OR Apache-2.0"
 readme = "README.md"

rust-toolchain

@@ -5,6 +5,6 @@
 # to the user in the error, instead of "error: invalid channel name '[toolchain]'".
 
 [toolchain]
-channel = "1.54.0"
+channel = "1.56.0"
 components = [ "rustfmt", "clippy" ]
 targets = [ "wasm32-unknown-unknown" ]