From b53acff5423c68df39d6c631b8cffd4461cf5fee Mon Sep 17 00:00:00 2001 From: Johan Smits Date: Fri, 3 Sep 2021 11:30:45 +0200 Subject: [PATCH 1/6] Add depend on stable seed-rs 0.8.0 and raise lib depends to latest verions --- atomic_hooks/Cargo.toml | 10 +++++----- seed_hooks/Cargo.toml | 12 ++++++------ seed_styles/Cargo.toml | 22 +++++++++++----------- seed_styles/src/style.rs | 6 +++--- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/atomic_hooks/Cargo.toml b/atomic_hooks/Cargo.toml index 505634f..77d4307 100644 --- a/atomic_hooks/Cargo.toml +++ b/atomic_hooks/Cargo.toml @@ -7,11 +7,11 @@ description = "Atomic Reative State and Local State Hooks" license = "Apache-2.0 OR MIT" [dependencies] -slotmap = "0.4.0" -anymap = "0.12.1" -illicit = "1.1.0" -typemap = "0.3.3" +slotmap = "^1.0.6" +anymap = "^0.12.1" +illicit = "^1.1.2" +typemap = "^0.3.3" atomic_hooks_macros = { path = "./macro" } -topo = { version = "0.13.1", features = ["wasm-bindgen"] } +topo = { version = "^0.13.2", features = ["wasm-bindgen"] } # topo = { path = "../../moxie/topo" } diff --git a/seed_hooks/Cargo.toml b/seed_hooks/Cargo.toml index fe7cf5c..58334c0 100644 --- a/seed_hooks/Cargo.toml +++ b/seed_hooks/Cargo.toml @@ -8,18 +8,18 @@ description = "Local state for Seed web apps" license = "Apache-2.0 OR MIT" [dependencies] -seed = { git = "https://github.com/seed-rs/seed", branch = "master" } +seed = "^0.8.0" atomic_hooks = { path = "../atomic_hooks" } gloo-timers = { version = "0.2.1", features = ["futures"] } -lazy_static = "1.4.0" -wasm-bindgen = "^0.2.62" -derive_more = "0.99.5" +lazy_static = "^1.4.0" +wasm-bindgen = "^0.2.76" +derive_more = "^0.99.16" [dev-dependencies] -wasm-bindgen-test = "0.3.12" +wasm-bindgen-test = "^0.3.26" [dependencies.web-sys] -version = "^0.3.39" +version = "^0.3.53" features = [ 'HtmlElement', "HtmlDocument", diff --git a/seed_styles/Cargo.toml b/seed_styles/Cargo.toml index d51d05f..8b2396a 100644 --- a/seed_styles/Cargo.toml +++ b/seed_styles/Cargo.toml @@ -7,23 +7,23 @@ description = "CSS Styling for Seed web apps" license = "Apache-2.0 OR MIT" [dependencies] -harsh = "0.1.6" +harsh = "^0.2.1" seed_style_macros = { path = "./seed_style_macros" } -wasm-bindgen = "^0.2.62" -ordered-float = "1.0.2" -anymap = "0.12.1" -derive_more = "0.99.5" -seed = { git = "https://github.com/seed-rs/seed", branch = "master" } +wasm-bindgen = "^0.2.76" +ordered-float = "^2.8.0" +anymap = "^0.12.1" +derive_more = "^0.99.16" +seed = "^0.8.0" seed_hooks = { path = "../seed_hooks" } -objekt-clonable = "0.2.2" -eager = "0.1.0" -rust-hsluv = "0.1.4" +objekt-clonable = "^0.2.2" +eager = "^0.1.0" +rust-hsluv = "^0.1.4" [dev-dependencies] -wasm-bindgen-test = "0.3.12" +wasm-bindgen-test = "^0.3.26" [dependencies.web-sys] -version = "^0.3.40" +version = "^0.3.53" features = [ 'HtmlElement', "HtmlDocument", diff --git a/seed_styles/src/style.rs b/seed_styles/src/style.rs index ab83a73..4a2c2d5 100644 --- a/seed_styles/src/style.rs +++ b/seed_styles/src/style.rs @@ -1,5 +1,5 @@ use derive_more::Display; -use harsh::{Harsh, HarshBuilder}; +use harsh::{Harsh}; use seed::{prelude::*, *}; use seed_hooks::*; @@ -44,11 +44,11 @@ thread_local! { pub static GLOBAL_STYLES_COUNT: Cell = Cell::new(0); pub static STYLES_USED : RefCell> = RefCell::new(HashSet::::new()); - pub static HASH_IDS_GENERATOR: RefCell = RefCell::new(HarshBuilder::new().init().unwrap()); + pub static HASH_IDS_GENERATOR: RefCell = RefCell::new(Harsh::default()); } fn short_uniq_id(id: u64) -> String { - HASH_IDS_GENERATOR.with(|h| h.borrow().encode(&[id]).unwrap()) + HASH_IDS_GENERATOR.with(|h| h.borrow().encode(&[id])) } use objekt_clonable::*; From 1eebfd99390a059e97d70a71dadcb4c3f6e91096 Mon Sep 17 00:00:00 2001 From: Johan Smits Date: Sat, 4 Sep 2021 12:16:53 +0200 Subject: [PATCH 2/6] Update depends based on feedback --- atomic_hooks/Cargo.toml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/atomic_hooks/Cargo.toml b/atomic_hooks/Cargo.toml index 77d4307..78efd00 100644 --- a/atomic_hooks/Cargo.toml +++ b/atomic_hooks/Cargo.toml @@ -7,11 +7,11 @@ description = "Atomic Reative State and Local State Hooks" license = "Apache-2.0 OR MIT" [dependencies] -slotmap = "^1.0.6" -anymap = "^0.12.1" -illicit = "^1.1.2" -typemap = "^0.3.3" +slotmap = "1.0.6" +anymap = "0.12.1" +illicit = "1.1.2" +typemap = "0.3.3" atomic_hooks_macros = { path = "./macro" } -topo = { version = "^0.13.2", features = ["wasm-bindgen"] } +topo = { version = "0.13.2", features = ["wasm-bindgen"] } # topo = { path = "../../moxie/topo" } From f162e7248c20bce4e0bac58c7ac7cb467c82a4a5 Mon Sep 17 00:00:00 2001 From: Johan Smits Date: Sat, 4 Sep 2021 12:17:51 +0200 Subject: [PATCH 3/6] Switch to seed github master branch --- seed_hooks/Cargo.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/seed_hooks/Cargo.toml b/seed_hooks/Cargo.toml index 58334c0..95c2494 100644 --- a/seed_hooks/Cargo.toml +++ b/seed_hooks/Cargo.toml @@ -8,18 +8,18 @@ description = "Local state for Seed web apps" license = "Apache-2.0 OR MIT" [dependencies] -seed = "^0.8.0" +seed = { git = "https://github.com/seed-rs/seed.git" branch = "master"} atomic_hooks = { path = "../atomic_hooks" } gloo-timers = { version = "0.2.1", features = ["futures"] } -lazy_static = "^1.4.0" -wasm-bindgen = "^0.2.76" -derive_more = "^0.99.16" +lazy_static = "1.4.0" +wasm-bindgen = "0.2.76" +derive_more = "0.99.16" [dev-dependencies] -wasm-bindgen-test = "^0.3.26" +wasm-bindgen-test = "0.3.26" [dependencies.web-sys] -version = "^0.3.53" +version = "0.3.53" features = [ 'HtmlElement', "HtmlDocument", From 0e1b1da08673887076703e1e9234942f652e088d Mon Sep 17 00:00:00 2001 From: Johan Smits Date: Sat, 4 Sep 2021 12:18:45 +0200 Subject: [PATCH 4/6] Switch to seed github master branch --- seed_styles/Cargo.toml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/seed_styles/Cargo.toml b/seed_styles/Cargo.toml index 8b2396a..f4a16c6 100644 --- a/seed_styles/Cargo.toml +++ b/seed_styles/Cargo.toml @@ -7,23 +7,23 @@ description = "CSS Styling for Seed web apps" license = "Apache-2.0 OR MIT" [dependencies] -harsh = "^0.2.1" +harsh = "0.2.1" seed_style_macros = { path = "./seed_style_macros" } -wasm-bindgen = "^0.2.76" -ordered-float = "^2.8.0" -anymap = "^0.12.1" -derive_more = "^0.99.16" -seed = "^0.8.0" +wasm-bindgen = "0.2.76" +ordered-float = "2.8.0" +anymap = "0.12.1" +derive_more = "0.99.16" +seed = { git = "https://github.com/seed-rs/seed.git" branch = "master"} seed_hooks = { path = "../seed_hooks" } -objekt-clonable = "^0.2.2" -eager = "^0.1.0" -rust-hsluv = "^0.1.4" +objekt-clonable = "0.2.2" +eager = "0.1.0" +rust-hsluv = "0.1.4" [dev-dependencies] -wasm-bindgen-test = "^0.3.26" +wasm-bindgen-test = "0.3.26" [dependencies.web-sys] -version = "^0.3.53" +version = "0.3.53" features = [ 'HtmlElement', "HtmlDocument", From 113819a68c81b8acae519a65d4bf83285a07652a Mon Sep 17 00:00:00 2001 From: Johan Smits Date: Sat, 4 Sep 2021 12:20:42 +0200 Subject: [PATCH 5/6] Fix typo in Cargo.toml --- seed_styles/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed_styles/Cargo.toml b/seed_styles/Cargo.toml index f4a16c6..6a5277d 100644 --- a/seed_styles/Cargo.toml +++ b/seed_styles/Cargo.toml @@ -13,7 +13,7 @@ wasm-bindgen = "0.2.76" ordered-float = "2.8.0" anymap = "0.12.1" derive_more = "0.99.16" -seed = { git = "https://github.com/seed-rs/seed.git" branch = "master"} +seed = { git = "https://github.com/seed-rs/seed.git", branch = "master"} seed_hooks = { path = "../seed_hooks" } objekt-clonable = "0.2.2" eager = "0.1.0" From 4ef23e1e997548b424df593fe59dd3242f7a5f70 Mon Sep 17 00:00:00 2001 From: Johan Smits Date: Sat, 4 Sep 2021 12:21:27 +0200 Subject: [PATCH 6/6] Fix typo in Cargo.toml --- seed_hooks/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seed_hooks/Cargo.toml b/seed_hooks/Cargo.toml index 95c2494..1bbebe7 100644 --- a/seed_hooks/Cargo.toml +++ b/seed_hooks/Cargo.toml @@ -8,7 +8,7 @@ description = "Local state for Seed web apps" license = "Apache-2.0 OR MIT" [dependencies] -seed = { git = "https://github.com/seed-rs/seed.git" branch = "master"} +seed = { git = "https://github.com/seed-rs/seed.git", branch = "master"} atomic_hooks = { path = "../atomic_hooks" } gloo-timers = { version = "0.2.1", features = ["futures"] } lazy_static = "1.4.0"