Update to Rust 1.65 (#2314)

* Update to Rust 1.65 Because then you can use dynamic linking on Linux * Fix a bunch of clippy lints * Update changelogs * More clippy fixes
emilk · Dec 2, 2022 · 922448c · 922448c
1 parent 938c56a
commit 922448c
Show file tree

Hide file tree

Showing 48 changed files with 195 additions and 187 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: default
-          toolchain: 1.64.0
+          toolchain: 1.65.0
           override: true
       - name: Install packages (Linux)
         if: runner.os == 'Linux'
@@ -84,7 +84,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.64.0
+          toolchain: 1.65.0
           target: wasm32-unknown-unknown
           override: true
 
@@ -136,7 +136,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: EmbarkStudios/cargo-deny-action@v1
         with:
-          rust-version: "1.62.0"
+          rust-version: "1.65.0"
 
   android:
     name: android
@@ -146,7 +146,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.64.0
+          toolchain: 1.65.0
           target: aarch64-linux-android
           override: true
       - name: Set up cargo cache

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ NOTE: [`epaint`](crates/epaint/CHANGELOG.md), [`eframe`](crates/eframe/CHANGELOG
 
 
 ## Unreleased
+* MSRV (Minimum Supported Rust Version) is now `1.65.0` ([#2314](https://github.com/emilk/egui/pull/2314)).
 * ⚠️ BREAKING: egui now expects integrations to do all color blending in gamma space ([#2071](https://github.com/emilk/egui/pull/2071)).
 * ⚠️ BREAKING: if you have overlapping interactive widgets, only the top widget (last added) will be interactive ([#2244](https://github.com/emilk/egui/pull/2244)).
 

diff --git a/Cranky.toml b/Cranky.toml
@@ -1,115 +1,122 @@
 # https://github.com/ericseppanen/cargo-cranky
 # cargo install cargo-cranky && cargo cranky
 
-deny = [
-  "unsafe_code",
-]
+deny = ["unsafe_code"]
 
 warn = [
-    "clippy::all",
-    "clippy::await_holding_lock",
-    "clippy::char_lit_as_u8",
-    "clippy::checked_conversions",
-    "clippy::dbg_macro",
-    "clippy::debug_assert_with_mut_call",
-    "clippy::disallowed_methods",
-    "clippy::disallowed_script_idents",
-    "clippy::doc_markdown",
-    "clippy::empty_enum",
-    "clippy::enum_glob_use",
-    "clippy::equatable_if_let",
-    "clippy::exit",
-    "clippy::expl_impl_clone_on_copy",
-    "clippy::explicit_deref_methods",
-    "clippy::explicit_into_iter_loop",
-    "clippy::explicit_iter_loop",
-    "clippy::fallible_impl_from",
-    "clippy::filter_map_next",
-    "clippy::flat_map_option",
-    "clippy::float_cmp_const",
-    "clippy::fn_params_excessive_bools",
-    "clippy::fn_to_numeric_cast_any",
-    "clippy::from_iter_instead_of_collect",
-    "clippy::if_let_mutex",
-    "clippy::implicit_clone",
-    "clippy::imprecise_flops",
-    "clippy::index_refutable_slice",
-    "clippy::inefficient_to_string",
-    "clippy::invalid_upcast_comparisons",
-    "clippy::iter_not_returning_iterator",
-    "clippy::large_digit_groups",
-    "clippy::large_stack_arrays",
-    "clippy::large_types_passed_by_value",
-    "clippy::let_unit_value",
-    "clippy::linkedlist",
-    "clippy::lossy_float_literal",
-    "clippy::macro_use_imports",
-    "clippy::manual_assert",
-    "clippy::manual_ok_or",
-    "clippy::map_err_ignore",
-    "clippy::map_flatten",
-    "clippy::map_unwrap_or",
-    "clippy::match_on_vec_items",
-    "clippy::match_same_arms",
-    "clippy::match_wild_err_arm",
-    "clippy::match_wildcard_for_single_variants",
-    "clippy::mem_forget",
-    "clippy::mismatched_target_os",
-    "clippy::missing_enforced_import_renames",
-    "clippy::missing_errors_doc",
-    "clippy::missing_safety_doc",
-    "clippy::mut_mut",
-    "clippy::mutex_integer",
-    "clippy::needless_borrow",
-    "clippy::needless_continue",
-    "clippy::needless_for_each",
-    "clippy::needless_pass_by_value",
-    "clippy::negative_feature_names",
-    "clippy::nonstandard_macro_braces",
-    "clippy::option_option",
-    "clippy::path_buf_push_overwrite",
-    "clippy::ptr_as_ptr",
-    "clippy::rc_mutex",
-    "clippy::ref_option_ref",
-    "clippy::rest_pat_in_fully_bound_structs",
-    "clippy::same_functions_in_if_condition",
-    "clippy::semicolon_if_nothing_returned",
-    "clippy::single_match_else",
-    "clippy::str_to_string",
-    "clippy::string_add_assign",
-    "clippy::string_add",
-    "clippy::string_lit_as_bytes",
-    "clippy::string_to_string",
-    "clippy::todo",
-    "clippy::trailing_empty_array",
-    "clippy::trait_duplication_in_bounds",
-    "clippy::unimplemented",
-    "clippy::unnecessary_wraps",
-    "clippy::unnested_or_patterns",
-    "clippy::unused_self",
-    "clippy::useless_transmute",
-    "clippy::verbose_file_reads",
-    "clippy::zero_sized_map_values",
-    "elided_lifetimes_in_paths",
-    "future_incompatible",
-    "nonstandard_style",
-    "rust_2018_idioms",
-    "rust_2021_prelude_collisions",
-    "rustdoc::missing_crate_level_docs",
-    "semicolon_in_expressions_from_macros",
-    "trivial_numeric_casts",
-    "unused_extern_crates",
-    "unused_import_braces",
-    "unused_lifetimes",
-    # "clippy::cloned_instead_of_copied",
-    # "clippy::mod_module_files",
-    # "trivial_casts",
-    # "unused_qualifications",
+  "clippy::all",
+  "clippy::await_holding_lock",
+  "clippy::bool_to_int_with_if",
+  "clippy::char_lit_as_u8",
+  "clippy::checked_conversions",
+  "clippy::dbg_macro",
+  "clippy::debug_assert_with_mut_call",
+  "clippy::disallowed_methods",
+  "clippy::disallowed_script_idents",
+  "clippy::doc_link_with_quotes",
+  "clippy::doc_markdown",
+  "clippy::empty_enum",
+  "clippy::enum_glob_use",
+  "clippy::equatable_if_let",
+  "clippy::exit",
+  "clippy::expl_impl_clone_on_copy",
+  "clippy::explicit_deref_methods",
+  "clippy::explicit_into_iter_loop",
+  "clippy::explicit_iter_loop",
+  "clippy::fallible_impl_from",
+  "clippy::filter_map_next",
+  "clippy::flat_map_option",
+  "clippy::float_cmp_const",
+  "clippy::fn_params_excessive_bools",
+  "clippy::fn_to_numeric_cast_any",
+  "clippy::from_iter_instead_of_collect",
+  "clippy::if_let_mutex",
+  "clippy::implicit_clone",
+  "clippy::imprecise_flops",
+  "clippy::index_refutable_slice",
+  "clippy::inefficient_to_string",
+  "clippy::invalid_upcast_comparisons",
+  "clippy::iter_not_returning_iterator",
+  "clippy::iter_on_empty_collections",
+  "clippy::iter_on_single_items",
+  "clippy::large_digit_groups",
+  "clippy::large_stack_arrays",
+  "clippy::large_types_passed_by_value",
+  "clippy::let_unit_value",
+  "clippy::linkedlist",
+  "clippy::lossy_float_literal",
+  "clippy::macro_use_imports",
+  "clippy::manual_assert",
+  "clippy::manual_instant_elapsed",
+  "clippy::manual_ok_or",
+  "clippy::manual_string_new",
+  "clippy::map_err_ignore",
+  "clippy::map_flatten",
+  "clippy::map_unwrap_or",
+  "clippy::match_on_vec_items",
+  "clippy::match_same_arms",
+  "clippy::match_wild_err_arm",
+  "clippy::match_wildcard_for_single_variants",
+  "clippy::mem_forget",
+  "clippy::mismatched_target_os",
+  "clippy::mismatching_type_param_order",
+  "clippy::missing_enforced_import_renames",
+  "clippy::missing_errors_doc",
+  "clippy::missing_safety_doc",
+  "clippy::mut_mut",
+  "clippy::mutex_integer",
+  "clippy::needless_borrow",
+  "clippy::needless_continue",
+  "clippy::needless_for_each",
+  "clippy::needless_pass_by_value",
+  "clippy::negative_feature_names",
+  "clippy::nonstandard_macro_braces",
+  "clippy::option_option",
+  "clippy::path_buf_push_overwrite",
+  "clippy::ptr_as_ptr",
+  "clippy::rc_mutex",
+  "clippy::ref_option_ref",
+  "clippy::rest_pat_in_fully_bound_structs",
+  "clippy::same_functions_in_if_condition",
+  "clippy::semicolon_if_nothing_returned",
+  "clippy::single_match_else",
+  "clippy::str_to_string",
+  "clippy::string_add_assign",
+  "clippy::string_add",
+  "clippy::string_lit_as_bytes",
+  "clippy::string_to_string",
+  "clippy::todo",
+  "clippy::trailing_empty_array",
+  "clippy::trait_duplication_in_bounds",
+  "clippy::unimplemented",
+  "clippy::unnecessary_wraps",
+  "clippy::unnested_or_patterns",
+  "clippy::unused_peekable",
+  "clippy::unused_rounding",
+  "clippy::unused_self",
+  "clippy::useless_transmute",
+  "clippy::verbose_file_reads",
+  "clippy::zero_sized_map_values",
+  "elided_lifetimes_in_paths",
+  "future_incompatible",
+  "nonstandard_style",
+  "rust_2018_idioms",
+  "rust_2021_prelude_collisions",
+  "rustdoc::missing_crate_level_docs",
+  "semicolon_in_expressions_from_macros",
+  "trivial_numeric_casts",
+  "unused_extern_crates",
+  "unused_import_braces",
+  "unused_lifetimes",
 ]
 
 allow = [
+  # TODO(emilk): enable more lints
+  "clippy::cloned_instead_of_copied",
   "clippy::derive_partial_eq_without_eq",
   "clippy::type_complexity",
-  "clippy::unnecessary_lazy_evaluations",
-  "clippy::let-and-return"
+  "clippy::undocumented_unsafe_blocks",
+  "trivial_casts",
+  "unsafe_op_in_unsafe_fn",               # `unsafe_op_in_unsafe_fn` may become the default in future Rust versions: https://github.com/rust-lang/rust/issues/71668
+  "unused_qualifications",
 ]
diff --git a/crates/eframe/CHANGELOG.md b/crates/eframe/CHANGELOG.md
@@ -5,6 +5,7 @@ NOTE: [`egui-winit`](../egui-winit/CHANGELOG.md), [`egui_glium`](../egui_glium/C
 
 
 ## Unreleased
+* MSRV (Minimum Supported Rust Version) is now `1.65.0` ([#2314](https://github.com/emilk/egui/pull/2314)).
 * Added `NativeOptions::fullsize_content` option on Mac to build titlebar-less windows with floating window controls ([#2049](https://github.com/emilk/egui/pull/2049)).
 * Added `NativeOptions::event_loop_builder` hook for apps to change platform specific event loop options ([#1952](https://github.com/emilk/egui/pull/1952)).
 * Enabled deferred render state initialization to support Android ([#1952](https://github.com/emilk/egui/pull/1952)).

diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.19.0"
 authors = ["Emil Ernerfeldt <[email protected]>"]
 description = "egui framework - write GUI apps that compiles to web and/or natively"
 edition = "2021"
-rust-version = "1.62"
+rust-version = "1.65"
 homepage = "https://github.com/emilk/egui/tree/master/crates/eframe"
 license = "MIT OR Apache-2.0"
 readme = "README.md"

diff --git a/crates/eframe/src/native/epi_integration.rs b/crates/eframe/src/native/epi_integration.rs
@@ -165,7 +165,7 @@ pub fn handle_app_output(
     }
 
     if let Some(fullscreen) = fullscreen {
-        window.set_fullscreen(fullscreen.then(|| winit::window::Fullscreen::Borderless(None)));
+        window.set_fullscreen(fullscreen.then_some(winit::window::Fullscreen::Borderless(None)));
     }
 
     if let Some(window_title) = window_title {
@@ -328,7 +328,7 @@ impl EpiIntegration {
             handle_app_output(window, self.egui_ctx.pixels_per_point(), app_output);
         }
 
-        let frame_time = (std::time::Instant::now() - frame_start).as_secs_f64() as f32;
+        let frame_time = frame_start.elapsed().as_secs_f64() as f32;
         self.frame.info.cpu_usage = Some(frame_time);
 
         full_output

diff --git a/crates/eframe/src/web/events.rs b/crates/eframe/src/web/events.rs
@@ -308,7 +308,7 @@ pub fn install_canvas_events(runner_container: &mut AppRunnerContainer) -> Resul
                     modifiers,
                 });
 
-            push_touches(&mut *runner_lock, egui::TouchPhase::Start, &event);
+            push_touches(&mut runner_lock, egui::TouchPhase::Start, &event);
             runner_lock.needs_repaint.repaint_asap();
             event.stop_propagation();
             event.prevent_default();
@@ -330,7 +330,7 @@ pub fn install_canvas_events(runner_container: &mut AppRunnerContainer) -> Resul
                 .events
                 .push(egui::Event::PointerMoved(pos));
 
-            push_touches(&mut *runner_lock, egui::TouchPhase::Move, &event);
+            push_touches(&mut runner_lock, egui::TouchPhase::Move, &event);
             runner_lock.needs_repaint.repaint_asap();
             event.stop_propagation();
             event.prevent_default();
@@ -357,7 +357,7 @@ pub fn install_canvas_events(runner_container: &mut AppRunnerContainer) -> Resul
                 // Then remove hover effect:
                 runner_lock.input.raw.events.push(egui::Event::PointerGone);
 
-                push_touches(&mut *runner_lock, egui::TouchPhase::End, &event);
+                push_touches(&mut runner_lock, egui::TouchPhase::End, &event);
                 runner_lock.needs_repaint.repaint_asap();
                 event.stop_propagation();
                 event.prevent_default();

diff --git a/crates/egui-wgpu/Cargo.toml b/crates/egui-wgpu/Cargo.toml
@@ -8,7 +8,7 @@ authors = [
   "Emil Ernerfeldt <[email protected]>",
 ]
 edition = "2021"
-rust-version = "1.62"
+rust-version = "1.65"
 homepage = "https://github.com/emilk/egui/tree/master/crates/egui-wgpu"
 license = "MIT OR Apache-2.0"
 readme = "README.md"

diff --git a/crates/egui-wgpu/src/winit.rs b/crates/egui-wgpu/src/winit.rs
@@ -46,7 +46,7 @@ impl Painter {
         Self {
             configuration,
             msaa_samples,
-            depth_format: (depth_bits > 0).then(|| wgpu::TextureFormat::Depth32Float),
+            depth_format: (depth_bits > 0).then_some(wgpu::TextureFormat::Depth32Float),
             depth_texture_view: None,
 
             instance,

diff --git a/crates/egui-winit/Cargo.toml b/crates/egui-winit/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.19.0"
 authors = ["Emil Ernerfeldt <[email protected]>"]
 description = "Bindings for using egui with winit"
 edition = "2021"
-rust-version = "1.62"
+rust-version = "1.65"
 homepage = "https://github.com/emilk/egui/tree/master/crates/egui-winit"
 license = "MIT OR Apache-2.0"
 readme = "README.md"

diff --git a/crates/egui-winit/src/window_settings.rs b/crates/egui-winit/src/window_settings.rs
@@ -68,7 +68,7 @@ impl WindowSettings {
                 })
                 .with_fullscreen(
                     self.fullscreen
-                        .then(|| winit::window::Fullscreen::Borderless(None)),
+                        .then_some(winit::window::Fullscreen::Borderless(None)),
                 )
         } else {
             window

diff --git a/crates/egui/Cargo.toml b/crates/egui/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.19.0"
 authors = ["Emil Ernerfeldt <[email protected]>"]
 description = "An easy-to-use immediate mode GUI that runs on both web and native"
 edition = "2021"
-rust-version = "1.62"
+rust-version = "1.65"
 homepage = "https://github.com/emilk/egui"
 license = "MIT OR Apache-2.0"
 readme = "../../README.md"

diff --git a/crates/egui/src/memory.rs b/crates/egui/src/memory.rs
@@ -293,7 +293,7 @@ impl Focus {
                 self.id_next_frame = self.last_interested; // frame-delay so gained_focus works
                 self.pressed_shift_tab = false;
             }
-        } else if self.pressed_tab && self.id == None && !self.give_to_next {
+        } else if self.pressed_tab && self.id.is_none() && !self.give_to_next {
             // nothing has focus and the user pressed tab - give focus to the first widgets that wants it:
             self.id = Some(id);
             self.pressed_tab = false;