1
0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 14:20:04 -04:00

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
This commit is contained in:
Emil Ernerfeldt
2022-11-16 19:08:03 +01:00
committed by GitHub
parent f7019926dc
commit eca5e6a4d2
48 changed files with 195 additions and 187 deletions

View File

@@ -4,7 +4,7 @@ version = "0.19.0"
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
license = "MIT OR Apache-2.0"
edition = "2021"
rust-version = "1.62"
rust-version = "1.65"
publish = false
default-run = "egui_demo_app"
@@ -19,18 +19,9 @@ crate-type = ["cdylib", "rlib"]
default = ["glow", "persistence"]
http = ["ehttp", "image", "poll-promise", "egui_extras/image"]
persistence = [
"eframe/persistence",
"egui/persistence",
"serde",
]
screen_reader = ["eframe/screen_reader"] # experimental
serde = [
"dep:serde",
"egui_demo_lib/serde",
"egui_extras/serde",
"egui/serde",
]
persistence = ["eframe/persistence", "egui/persistence", "serde"]
screen_reader = ["eframe/screen_reader"] # experimental
serde = ["dep:serde", "egui_demo_lib/serde", "egui_extras/serde", "egui/serde"]
syntax_highlighting = ["egui_demo_lib/syntax_highlighting"]
glow = ["eframe/glow"]
@@ -40,8 +31,12 @@ wgpu = ["eframe/wgpu", "bytemuck"]
[dependencies]
chrono = { version = "0.4", features = ["js-sys", "wasmbind"] }
eframe = { version = "0.19.0", path = "../eframe", default-features = false }
egui = { version = "0.19.0", path = "../egui", features = ["extra_debug_asserts"] }
egui_demo_lib = { version = "0.19.0", path = "../egui_demo_lib", features = ["chrono"] }
egui = { version = "0.19.0", path = "../egui", features = [
"extra_debug_asserts",
] }
egui_demo_lib = { version = "0.19.0", path = "../egui_demo_lib", features = [
"chrono",
] }
tracing = "0.1"
# Optional dependencies:

View File

@@ -96,7 +96,7 @@ impl FrameHistory {
let cpu_usage = to_screen.inverse().transform_pos(pointer_pos).y;
let text = format!("{:.1} ms", 1e3 * cpu_usage);
shapes.push(Shape::text(
&*ui.fonts(),
&ui.fonts(),
pos2(rect.left(), y),
egui::Align2::LEFT_BOTTOM,
text,

View File

@@ -59,15 +59,13 @@ pub fn init_wasm_hooks() {
#[wasm_bindgen]
pub async fn start_separate(canvas_id: &str) -> Result<WebHandle, wasm_bindgen::JsValue> {
let web_options = eframe::WebOptions::default();
let handle = eframe::start_web(
eframe::start_web(
canvas_id,
web_options,
Box::new(|cc| Box::new(WrapApp::new(cc))),
)
.await
.map(|handle| WebHandle { handle });
handle
.map(|handle| WebHandle { handle })
}
/// This is the entry-point for all the web-assembly.