djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compilation with "serialize" feature without "persistence" feature

Browse source
This commit is contained in:
Emil Ernerfeldt 2021-10-23 15:12:39 +02:00
parent 4ace85b780
commit da09a5c69c
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
egui/src/memory.rs
View file

@ -28,6 +28,7 @@ pub struct Memory {
/// This map stores current states for widgets that don't require `Id`. /// This map stores current states for widgets that don't require `Id`.
/// This will be saved between different program runs if you use the `persistence` feature. /// This will be saved between different program runs if you use the `persistence` feature.
#[cfg(not(feature = "persistence"))] #[cfg(not(feature = "persistence"))]
#[cfg_attr(feature = "serde", serde(skip))]
pub data: any::TypeMap, pub data: any::TypeMap,
/// Same as `data`, but this data will not be saved between runs. /// Same as `data`, but this data will not be saved between runs.
@ -42,6 +43,7 @@ pub struct Memory {
/// This map stores current states for all widgets with custom `Id`s. /// This map stores current states for all widgets with custom `Id`s.
/// This will be saved between different program runs if you use the `persistence` feature. /// This will be saved between different program runs if you use the `persistence` feature.
#[cfg(not(feature = "persistence"))] #[cfg(not(feature = "persistence"))]
#[cfg_attr(feature = "serde", serde(skip))]
pub id_data: any::AnyMap<Id, crate::id::BuilIdHasher>, pub id_data: any::AnyMap<Id, crate::id::BuilIdHasher>,
/// Same as `id_data`, but this data will not be saved between runs. /// Same as `id_data`, but this data will not be saved between runs.

2
sh/check.sh
View file

@ -23,7 +23,7 @@ cargo doc -p egui_web --target wasm32-unknown-unknown --lib --no-deps --all-feat
(cd epaint && cargo check --no-default-features --features "multi_threaded") (cd epaint && cargo check --no-default-features --features "multi_threaded")
(cd epaint && cargo check --no-default-features --features "single_threaded" --release) (cd epaint && cargo check --no-default-features --features "single_threaded" --release)
(cd epaint && cargo check --no-default-features --features "multi_threaded" --release) (cd epaint && cargo check --no-default-features --features "multi_threaded" --release)
(cd egui && cargo check --no-default-features --features "multi_threaded") (cd egui && cargo check --no-default-features --features "multi_threaded,serialize")
(cd eframe && cargo check --no-default-features --features "egui_glow") (cd eframe && cargo check --no-default-features --features "egui_glow")
(cd epi && cargo check --no-default-features) (cd epi && cargo check --no-default-features)
(cd egui_web && cargo check --no-default-features) (cd egui_web && cargo check --no-default-features)