From d8300037ad9c2de3ec27146b3fa63a23a6198e95 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Tue, 8 Mar 2022 08:26:43 +0100 Subject: [PATCH] Fix `cargo run -p egui_demo_app` (#1343) Broken by https://github.com/emilk/egui/pull/1303 --- .github/workflows/rust.yml | 13 +++++++++++++ egui_glow/src/lib.rs | 13 +++---------- sh/check.sh | 1 + 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index a4a0c779..5865f0bd 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -56,6 +56,19 @@ jobs: command: check args: -p egui_demo_app --lib --target wasm32-unknown-unknown + check_egui_demo_app: + name: cargo check -p egui_demo_app + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + - uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: 1.56.0 + override: true + - name: check + run: cargo check -p egui_demo_app + check_wasm_eframe_with_features: name: cargo check wasm eframe runs-on: ubuntu-20.04 diff --git a/egui_glow/src/lib.rs b/egui_glow/src/lib.rs index 6889e9cd..227b6527 100644 --- a/egui_glow/src/lib.rs +++ b/egui_glow/src/lib.rs @@ -100,15 +100,8 @@ pub mod winit; #[cfg(all(not(target_arch = "wasm32"), feature = "winit"))] pub use winit::*; -#[cfg(all( - not(target_arch = "wasm32"), - feature = "persistence", - feature = "winit" -))] +#[cfg(all(not(target_arch = "wasm32"), feature = "winit"))] mod epi_backend; -#[cfg(all( - not(target_arch = "wasm32"), - feature = "persistence", - feature = "winit" -))] + +#[cfg(all(not(target_arch = "wasm32"), feature = "winit"))] pub use epi_backend::{run, NativeOptions}; diff --git a/sh/check.sh b/sh/check.sh index d60b71b6..86de92f9 100755 --- a/sh/check.sh +++ b/sh/check.sh @@ -37,6 +37,7 @@ cargo doc --document-private-items --no-deps --all-features (cd eframe && cargo check --all-features) (cd egui && cargo check --all-features) +(cd egui_demo_app && cargo check --all-features) (cd egui_extras && cargo check --all-features) (cd egui_glium && cargo check --all-features) (cd egui_glow && cargo check --all-features)