diff --git a/Cargo.toml b/Cargo.toml index 423895a..3ec97f9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,18 +19,16 @@ required-features = ["egui"] [features] default = ["disable_contracts"] cli = ["dep:clap"] -egui = ["dep:sys-locale", "dep:unic-langid", "dep:fluent-templates", "dep:eframe", "dep:egui", "dep:rfd", "dep:futures"] +egui = ["dep:sys-locale", "dep:unic-langid", "dep:fluent-templates", "dep:eframe", "dep:egui", "dep:rfd", "dep:futures-executor"] disable_contracts = ["contracts/disable_contracts"] [dependencies] thiserror = "1.0.56" -anyhow = "1.0.79" rstar = "0.11.0" petgraph = "0.6.3" spade = "2.2.0" serde_json = "1.0.117" enum_dispatch = "0.3.12" -itertools = "0.8.2" contracts = "0.6.3" bimap = "0.6.3" log = "0.4" @@ -79,14 +77,10 @@ version = "0.28.1" optional = true version = "0.14.0" -[dependencies.futures] +[dependencies.futures-executor] optional = true version = "0.3.30" -[dependencies.gl] -optional = true -version = "0.14.0" - [target.'cfg(not(target_arch = "wasm32"))'.dependencies] env_logger = "0.10" diff --git a/src/bin/topola-egui/app.rs b/src/bin/topola-egui/app.rs index ef3c8bf..8105c09 100644 --- a/src/bin/topola-egui/app.rs +++ b/src/bin/topola-egui/app.rs @@ -1,4 +1,3 @@ -use futures::executor; use geo::point; use petgraph::visit::{EdgeRef, IntoEdgeReferences}; use serde::{Deserialize, Serialize}; @@ -224,7 +223,7 @@ impl eframe::App for App { #[cfg(not(target_arch = "wasm32"))] pub fn execute + Send + 'static>(f: F) { - std::thread::spawn(move || futures::executor::block_on(f)); + std::thread::spawn(move || futures_executor::block_on(f)); } #[cfg(target_arch = "wasm32")]