From 8fc81b47ee9ce02fe6d3e4a8761642860123f26b Mon Sep 17 00:00:00 2001 From: Hamza Date: Sun, 6 Jun 2021 00:02:11 +0500 Subject: [PATCH] Fix issues after cherry-picking --- examples/router/src/pages/post.rs | 7 ++++--- packages/yew-macro/tests/html_macro/block-fail.stderr | 4 ++-- packages/yew-macro/tests/html_macro/iterable-fail.stderr | 4 ++-- packages/yew-router-macro/Cargo.toml | 2 +- packages/yew-router/Cargo.toml | 2 +- packages/yew-router/tests/router.rs | 2 +- packages/yew/Cargo.toml | 5 +---- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/examples/router/src/pages/post.rs b/examples/router/src/pages/post.rs index 2253e97e4..1c692ce2b 100644 --- a/examples/router/src/pages/post.rs +++ b/examples/router/src/pages/post.rs @@ -1,5 +1,6 @@ use crate::{content, generator::Generated, Route}; use content::PostPart; +use std::borrow::Cow; use yew::prelude::*; use yew_router::prelude::*; @@ -46,7 +47,7 @@ impl Component for Post { html! { <>
- +

@@ -77,7 +78,7 @@ impl Post {

- +

@@ -97,7 +98,7 @@ impl Post { fn render_section_hero(&self, section: &content::Section) -> Html { html! {
- +

{ §ion.title }

diff --git a/packages/yew-macro/tests/html_macro/block-fail.stderr b/packages/yew-macro/tests/html_macro/block-fail.stderr index 3ed7c79ee..26fb59921 100644 --- a/packages/yew-macro/tests/html_macro/block-fail.stderr +++ b/packages/yew-macro/tests/html_macro/block-fail.stderr @@ -34,9 +34,9 @@ error[E0277]: `()` doesn't implement `std::fmt::Display` 15 | <>{ for (0..3).map(|_| not_tree()) } | ^^^^^^ `()` cannot be formatted with the default formatter | - ::: $WORKSPACE/packages/yew/src/utils.rs:76:8 + ::: $WORKSPACE/packages/yew/src/utils.rs | -76 | T: Into, + | T: Into, | ------- required by this bound in `into_node_iter` | = help: the trait `std::fmt::Display` is not implemented for `()` diff --git a/packages/yew-macro/tests/html_macro/iterable-fail.stderr b/packages/yew-macro/tests/html_macro/iterable-fail.stderr index b0f60b70c..02b832ae5 100644 --- a/packages/yew-macro/tests/html_macro/iterable-fail.stderr +++ b/packages/yew-macro/tests/html_macro/iterable-fail.stderr @@ -70,9 +70,9 @@ error[E0277]: `()` is not an iterator 18 | { for () } | ^^ `()` is not an iterator | - ::: $WORKSPACE/packages/yew/src/utils.rs:75:9 + ::: $WORKSPACE/packages/yew/src/utils.rs | -75 | IT: IntoIterator, + | IT: IntoIterator, | ---------------------- required by this bound in `into_node_iter` | = help: the trait `Iterator` is not implemented for `()` diff --git a/packages/yew-router-macro/Cargo.toml b/packages/yew-router-macro/Cargo.toml index 25c6406a2..de52519ff 100644 --- a/packages/yew-router-macro/Cargo.toml +++ b/packages/yew-router-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yew-router-macro" -version = "0.14.0" +version = "0.15.0" authors = ["Hamza "] edition = "2018" license = "MIT OR Apache-2.0" diff --git a/packages/yew-router/Cargo.toml b/packages/yew-router/Cargo.toml index 24a0d2282..de68622d5 100644 --- a/packages/yew-router/Cargo.toml +++ b/packages/yew-router/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yew-router" -version = "0.14.0" +version = "0.15.0" authors = ["Hamza "] edition = "2018" license = "MIT OR Apache-2.0" diff --git a/packages/yew-router/tests/router.rs b/packages/yew-router/tests/router.rs index 07eb8843d..67a78dab8 100644 --- a/packages/yew-router/tests/router.rs +++ b/packages/yew-router/tests/router.rs @@ -61,7 +61,7 @@ fn component() -> Html { {"click me"} }, - Routes::No { id } => html! { }, + Routes::No { id } => html! { }, Routes::NotFound => html! {
{"404"}
}, } }); diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index 496888c90..93653de79 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -30,7 +30,7 @@ slab = "0.4" thiserror = "1" wasm-bindgen = "0.2.74" wasm-bindgen-futures = "0.4" -yew-macro = { version = "0.17.0", path = "../yew-macro" } +yew-macro = { version = "^0.18.0", path = "../yew-macro" } # optional encodings bincode = { version = "1", optional = true } @@ -38,9 +38,6 @@ rmp-serde = { version = "0.15.0", optional = true } serde_cbor = { version = "0.11.1", optional = true } serde_yaml = { version = "0.8.4", optional = true } toml = { version = "0.5", optional = true } -wasm-bindgen = { version = "0.2.60", optional = true } -wasm-bindgen-futures = { version = "0.4", optional = true } -yew-macro = { version = "^0.18.0", path = "../yew-macro" } [dependencies.web-sys] version = "0.3"