migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 06:10:06 -04:00
Code Activity

Update MSRV to Rust 1.72 (#3595)

Browse Source 
Required to update to puffin 0.18
This commit is contained in:
Emil Ernerfeldt
2023-11-21 17:26:35 +01:00
committed by GitHub
parent 7abf8afd16
commit bfadb90d42
48 changed files with 206 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/egui-wgpu/Cargo.toml
View File

@@ -8,7 +8,7 @@ authors = [
"Emil Ernerfeldt <emil.ernerfeldt@gmail.com>",
]
edition = "2021"
rust-version = "1.70"
rust-version = "1.72"
homepage = "https://github.com/emilk/egui/tree/master/crates/egui-wgpu"
license = "MIT OR Apache-2.0"
readme = "README.md"

7
crates/egui-wgpu/src/renderer.rs
View File

@@ -7,11 +7,7 @@ use epaint::{ahash::HashMap, emath::NumExt, PaintCallbackInfo, Primitive, Vertex
use wgpu;
use wgpu::util::DeviceExt as _;
// Only implements Send + Sync on wasm32 in order to allow storing wgpu resources on the type map.
#[cfg(not(target_arch = "wasm32"))]
pub type CallbackResources = type_map::concurrent::TypeMap;
#[cfg(target_arch = "wasm32")]
pub type CallbackResources = type_map::TypeMap;
pub struct Callback(Box<dyn CallbackTrait>);
@@ -987,9 +983,6 @@ impl ScissorRect {
}
}
// Wgpu objects contain references to the JS heap on the web, therefore they are not Send/Sync.
// It follows that egui_wgpu::Renderer can not be Send/Sync either when building with wasm.
#[cfg(not(target_arch = "wasm32"))]
#[test]
fn renderer_impl_send_sync() {
fn assert_send_sync<T: Send + Sync>() {}