summaryrefslogtreecommitdiffstats
path: root/web/src
diff options
context:
space:
mode:
Diffstat (limited to 'web/src')
-rw-r--r--web/src/lib.rs6
-rw-r--r--web/src/subscription.rs4
2 files changed, 5 insertions, 5 deletions
diff --git a/web/src/lib.rs b/web/src/lib.rs
index 7ea22e85..b183c390 100644
--- a/web/src/lib.rs
+++ b/web/src/lib.rs
@@ -72,9 +72,10 @@ pub use dodrio;
pub use element::Element;
pub use hasher::Hasher;
pub use iced_core::{
- Align, Background, Color, Command, Font, HorizontalAlignment, Length,
+ Align, Background, Color, Font, HorizontalAlignment, Length,
VerticalAlignment,
};
+pub use iced_futures::Command;
pub use style::Style;
pub use subscription::Subscription;
pub use widget::*;
@@ -148,7 +149,6 @@ pub trait Application {
}
}
-
struct Instance<Message> {
title: String,
ui: Rc<RefCell<Box<dyn Application<Message = Message>>>>,
@@ -167,7 +167,7 @@ impl<Message> Clone for Instance<Message> {
impl<Message> Instance<Message>
where
- Message: 'static
+ Message: 'static,
{
fn new(ui: impl Application<Message = Message> + 'static) -> Self {
Self {
diff --git a/web/src/subscription.rs b/web/src/subscription.rs
index 4638c8ab..6b8415c0 100644
--- a/web/src/subscription.rs
+++ b/web/src/subscription.rs
@@ -14,6 +14,6 @@ use crate::Hasher;
///
/// [`Command`]: ../struct.Command.html
/// [`Subscription`]: struct.Subscription.html
-pub type Subscription<T> = iced_core::Subscription<Hasher, (), T>;
+pub type Subscription<T> = iced_futures::Subscription<Hasher, (), T>;
-pub use iced_core::subscription::Recipe;
+pub use iced_futures::subscription::Recipe;