1
0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 05:10:03 -04:00

Update to Rust 1.76 (#4411)

Motivation: I want to replace `cargo-cranky` with workspace lints, first
available in Rust 1.74.
However, `cargo doc` would hange on `wgpu` and `wgpu-core` on 1.74 and
1.75… so now we're on 1.76.
I think this is fine - when 1.78 is released next week we're still two
versions behind the bleeding edge.

…and the branch name is just wrong 🤦
This commit is contained in:
Emil Ernerfeldt
2024-04-25 15:51:01 +02:00
committed by GitHub
parent bfe1858e0b
commit cee790681d
37 changed files with 45 additions and 48 deletions

View File

@@ -225,9 +225,7 @@ fn set_title_and_icon_mac(title: &str, icon_data: Option<&IconData>) -> AppIconS
}
unsafe {
let app = if let Some(app) = NSApp {
app
} else {
let Some(app) = NSApp else {
log::debug!("NSApp is null");
return AppIconStatus::NotSetIgnored;
};

View File

@@ -391,6 +391,8 @@ pub fn run_glow(
mut native_options: epi::NativeOptions,
app_creator: epi::AppCreator,
) -> Result<()> {
#![allow(clippy::needless_return_with_question_mark)] // False positive
use super::glow_integration::GlowWinitApp;
#[cfg(not(target_os = "ios"))]
@@ -414,6 +416,8 @@ pub fn run_wgpu(
mut native_options: epi::NativeOptions,
app_creator: epi::AppCreator,
) -> Result<()> {
#![allow(clippy::needless_return_with_question_mark)] // False positive
use super::wgpu_integration::WgpuWinitApp;
#[cfg(not(target_os = "ios"))]

View File

@@ -31,7 +31,7 @@ pub(crate) fn load_memory(_: &egui::Context) {}
#[cfg(feature = "persistence")]
pub(crate) fn save_memory(ctx: &egui::Context) {
match ctx.memory(|mem| ron::to_string(mem)) {
match ctx.memory(ron::to_string) {
Ok(ron) => {
local_storage_set("egui_memory_ron", &ron);
}