From 01242c6f12076edda9a158f4145f4c5c7a9841c9 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Fri, 5 Jul 2019 15:18:52 +0200 Subject: [PATCH] Use yew 0.6.0 (#356) --- Cargo.lock | 86 +++++---------------------------------------- frontend/Cargo.toml | 4 +-- 2 files changed, 11 insertions(+), 79 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 11f622999..955d08343 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -439,11 +439,6 @@ name = "bitflags" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "boolinator" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "brotli-sys" version = "0.3.2" @@ -1432,21 +1427,6 @@ dependencies = [ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "proc-macro-nested" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "proc-macro2" version = "0.4.30" @@ -2555,8 +2535,8 @@ dependencies = [ "stdweb 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "webapp 0.3.0", - "yew 0.7.0 (git+https://github.com/DenisKolodin/yew)", - "yew-router 0.1.0 (git+https://github.com/saschagrunert/yew-router)", + "yew 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", + "yew-router 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2642,8 +2622,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "yew" -version = "0.7.0" -source = "git+https://github.com/DenisKolodin/yew#446983a82dee899163f21de1688d79b8990cea93" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2656,59 +2636,17 @@ dependencies = [ "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "stdweb 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", - "yew-macro 0.7.0 (git+https://github.com/DenisKolodin/yew)", - "yew-shared 0.7.0 (git+https://github.com/DenisKolodin/yew)", -] - -[[package]] -name = "yew-macro" -version = "0.7.0" -source = "git+https://github.com/DenisKolodin/yew#446983a82dee899163f21de1688d79b8990cea93" -dependencies = [ - "proc-macro-hack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "yew-macro-impl 0.7.0 (git+https://github.com/DenisKolodin/yew)", - "yew-shared 0.7.0 (git+https://github.com/DenisKolodin/yew)", -] - -[[package]] -name = "yew-macro-impl" -version = "0.7.0" -source = "git+https://github.com/DenisKolodin/yew#446983a82dee899163f21de1688d79b8990cea93" -dependencies = [ - "boolinator 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro-hack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.39 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "yew-router" -version = "0.1.0" -source = "git+https://github.com/saschagrunert/yew-router#7a6c938c39095fe4b4033c7119038eacd130fd77" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", "stdweb 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)", - "yew 0.7.0 (git+https://github.com/DenisKolodin/yew)", -] - -[[package]] -name = "yew-shared" -version = "0.7.0" -source = "git+https://github.com/DenisKolodin/yew#446983a82dee899163f21de1688d79b8990cea93" -dependencies = [ - "anymap 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", - "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.94 (registry+https://github.com/rust-lang/crates.io-index)", - "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "stdweb 0.4.17 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.47 (registry+https://github.com/rust-lang/crates.io-index)", + "yew 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [metadata] @@ -2744,7 +2682,6 @@ dependencies = [ "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" "checksum bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9f2fb9e29e72fd6bc12071533d5dc7664cb01480c59406f656d7ac25c7bd8ff7" "checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" -"checksum boolinator 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cfa8873f51c92e232f9bac4065cddef41b714152812bfc5f7672ba16d6ef8cd9" "checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" "checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" "checksum bumpalo 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2cd43d82f27d68911e6ee11ee791fb248f138f5d69424dc02e098d4f152b0b05" @@ -2858,8 +2795,6 @@ dependencies = [ "checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" "checksum pq-sys 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac25eee5a0582f45a67e837e350d784e7003bd29a5f460796772061ca49ffda" -"checksum proc-macro-hack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0c1dd4172a1e1f96f709341418f49b11ea6c2d95d53dca08c0f74cbd332d9cf3" -"checksum proc-macro-nested 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "369a6ed065f249a159e06c45752c780bda2fb53c995718f9e484d08daa9eb42e" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" "checksum publicsuffix 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5afecba86dcf1e4fd610246f89899d1924fe12e1e89f555eb7c7f710f3c5ad1d" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" @@ -2985,8 +2920,5 @@ dependencies = [ "checksum winutil 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e" "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" "checksum yaml-rust 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992" -"checksum yew 0.7.0 (git+https://github.com/DenisKolodin/yew)" = "" -"checksum yew-macro 0.7.0 (git+https://github.com/DenisKolodin/yew)" = "" -"checksum yew-macro-impl 0.7.0 (git+https://github.com/DenisKolodin/yew)" = "" -"checksum yew-router 0.1.0 (git+https://github.com/saschagrunert/yew-router)" = "" -"checksum yew-shared 0.7.0 (git+https://github.com/DenisKolodin/yew)" = "" +"checksum yew 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca078a19e3459f7d73b135015477bc8cdcc92c3f4a058ae949f4d957a47dfd55" +"checksum yew-router 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f2412a3f0de35dfef8799d84f1937973c1c0628c3456d986fe9d89ac5e0da5c5" diff --git a/frontend/Cargo.toml b/frontend/Cargo.toml index 494d91016..97a33f9e7 100644 --- a/frontend/Cargo.toml +++ b/frontend/Cargo.toml @@ -33,5 +33,5 @@ log = "0.4.6" serde = { version = "1.0.94", features = [ "derive" ]} stdweb = "0.4.17" webapp = { path = ".." } -yew = { git = "https://github.com/DenisKolodin/yew", features = ["cbor"] } -yew-router = { git = "https://github.com/saschagrunert/yew-router" } +yew = { version = "0.6.0", features = ["cbor"] } +yew-router = "0.2.0"