From 209c5a9f639820973d558ed76bd1593dbdb9ec23 Mon Sep 17 00:00:00 2001 From: Pauan Date: Wed, 28 Feb 2018 01:59:45 -1000 Subject: [PATCH] Changing to use stdweb 0.4.0: it's now usable! --- Cargo.toml | 4 ++-- examples/todomvc/Cargo.toml | 2 +- examples/todomvc/src/main.rs | 13 +++++++------ src/operations.rs | 2 +- src/traits.rs | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index dda49e9..8ddc34b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,11 +4,11 @@ version = "0.1.0" authors = ["Pauan "] [dependencies] -stdweb-derive = { path = "../stdweb/stdweb-derive" } +stdweb-derive = "0.4.0" lazy_static = "1.0.0" discard = "1.0.3" signals = { path = "./signals" } [dependencies.stdweb] -path = "../stdweb" +version = "0.4.0" features = ["experimental_features_which_may_break_on_minor_version_bumps"] diff --git a/examples/todomvc/Cargo.toml b/examples/todomvc/Cargo.toml index 6717fd2..ebec9f1 100644 --- a/examples/todomvc/Cargo.toml +++ b/examples/todomvc/Cargo.toml @@ -8,5 +8,5 @@ dominator = { path = "../.." } signals = { path = "../../signals" } [dependencies.stdweb] -path = "../../../stdweb" +version = "0.4.0" features = ["experimental_features_which_may_break_on_minor_version_bumps"] diff --git a/examples/todomvc/src/main.rs b/examples/todomvc/src/main.rs index af08177..525de9c 100644 --- a/examples/todomvc/src/main.rs +++ b/examples/todomvc/src/main.rs @@ -15,7 +15,8 @@ use stdweb::web::{document, HtmlElement}; use stdweb::web::event::ClickEvent; use stdweb::web::IParentNode; -use signals::Signal; +use signals::signal; +use signals::signal::Signal; use dominator::traits::*; use dominator::{Dom, text}; @@ -35,15 +36,15 @@ fn main() { let mut count = 0; - let (sender_elements, receiver_elements) = signals::unsync::mutable(count); + let (sender_elements, receiver_elements) = signal::unsync::mutable(count); let mut width: u32 = 10; - let (sender1, receiver1) = signals::unsync::mutable(width); - let (sender2, receiver2) = signals::unsync::mutable(vec![width]); - let (sender3, receiver3) = signals::unsync::mutable(vec![width]); - let (text_sender, text_receiver) = signals::unsync::mutable(format!("{}", width)); + let (sender1, receiver1) = signal::unsync::mutable(width); + let (sender2, receiver2) = signal::unsync::mutable(vec![width]); + let (sender3, receiver3) = signal::unsync::mutable(vec![width]); + let (text_sender, text_receiver) = signal::unsync::mutable(format!("{}", width)); /*let style_width = receiver1.switch(move |x| { receiver2.clone().switch(move |y| { diff --git a/src/operations.rs b/src/operations.rs index 9654d09..4e8c5ee 100644 --- a/src/operations.rs +++ b/src/operations.rs @@ -2,7 +2,7 @@ use stdweb::PromiseFuture; use discard::{Discard, DiscardOnDrop}; use stdweb::Reference; use stdweb::web::TextNode; -use signals::{Signal, cancelable_future, CancelableFutureHandle}; +use signals::signal::{Signal, cancelable_future, CancelableFutureHandle}; use dom_operations; use dom::{Dom, IStyle}; use callbacks::Callbacks; diff --git a/src/traits.rs b/src/traits.rs index 5bf1d9f..1b5bf89 100644 --- a/src/traits.rs +++ b/src/traits.rs @@ -4,7 +4,7 @@ use stdweb::traits::{IElement, IHtmlElement, INode}; use stdweb::unstable::TryInto; use dom::{Dom, IStyle, Dynamic}; use callbacks::Callbacks; -use signals::Signal; +use signals::signal::Signal; use operations;