From 6de54c135dec32f7825dd8e9f8943c2d0357aa4c Mon Sep 17 00:00:00 2001 From: Denis Kolodin Date: Sat, 2 Feb 2019 16:00:36 +0300 Subject: [PATCH] Update all examples to Rust 2018 --- Cargo.toml | 2 +- examples/counter/Cargo.toml | 1 + examples/counter/src/lib.rs | 2 +- examples/crm/Cargo.toml | 1 + examples/crm/src/lib.rs | 6 +---- examples/crm/src/markdown.rs | 3 +-- examples/custom_components/Cargo.toml | 1 + examples/custom_components/src/barrier.rs | 4 ++-- examples/custom_components/src/button.rs | 2 +- examples/custom_components/src/counter.rs | 2 +- examples/custom_components/src/lib.rs | 5 +--- examples/dashboard/Cargo.toml | 1 + examples/dashboard/src/lib.rs | 9 ++----- examples/fragments/Cargo.toml | 1 + examples/fragments/src/lib.rs | 5 +--- examples/game_of_life/Cargo.toml | 5 ++-- examples/game_of_life/src/lib.rs | 8 ++----- examples/game_of_life/src/main.rs | 7 +++--- examples/inner_html/Cargo.toml | 1 + examples/inner_html/src/lib.rs | 4 +--- examples/js_callback/Cargo.toml | 1 + examples/js_callback/src/lib.rs | 6 ++--- examples/large_table/Cargo.toml | 1 + examples/large_table/src/lib.rs | 5 +--- examples/mount_point/Cargo.toml | 1 + examples/mount_point/src/lib.rs | 5 +--- examples/mount_point/src/main.rs | 5 +++- examples/multi_thread/Cargo.toml | 1 + examples/multi_thread/src/bin/main.rs | 11 +-------- .../multi_thread/src/bin/native_worker.rs | 10 ++------ examples/multi_thread/src/context.rs | 4 +++- examples/multi_thread/src/job.rs | 4 +++- examples/multi_thread/src/lib.rs | 11 +++------ examples/multi_thread/src/native_worker.rs | 4 +++- examples/npm_and_rest/Cargo.toml | 1 + examples/npm_and_rest/src/gravatar.rs | 3 ++- examples/npm_and_rest/src/lib.rs | 8 +------ examples/routing/Cargo.toml | 1 + examples/routing/src/b_component.rs | 20 ++++++++-------- examples/routing/src/lib.rs | 13 +++------- examples/routing/src/router.rs | 11 ++++----- examples/server/Cargo.toml | 1 + examples/server/src/main.rs | 2 -- examples/showcase/Cargo.toml | 1 + examples/showcase/src/main.rs | 24 ++----------------- examples/textarea/Cargo.toml | 1 + examples/textarea/src/lib.rs | 5 +--- examples/timer/Cargo.toml | 1 + examples/timer/src/lib.rs | 5 +--- examples/todomvc/Cargo.toml | 1 + examples/todomvc/src/lib.rs | 5 ++-- examples/two_apps/Cargo.toml | 1 + examples/two_apps/src/lib.rs | 6 ++--- examples/two_apps/src/main.rs | 2 +- 54 files changed, 91 insertions(+), 160 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7c5f9abc0db..fc58f1c6827 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ serde_json = "1.0" bincode = "1.0" anymap = "0.12" slab = "0.4" -stdweb = "^0.4.9" +stdweb = "^0.4.13" toml = { version = "0.4", optional = true } serde_yaml = { version = "0.8.3", optional = true } rmp-serde = { version = "0.13.7", optional = true } diff --git a/examples/counter/Cargo.toml b/examples/counter/Cargo.toml index fb1666e998d..1ad06a5cb88 100644 --- a/examples/counter/Cargo.toml +++ b/examples/counter/Cargo.toml @@ -2,6 +2,7 @@ name = "counter" version = "0.1.1" authors = ["Denis Kolodin "] +edition = "2018" [dependencies] stdweb = "0.4.2" diff --git a/examples/counter/src/lib.rs b/examples/counter/src/lib.rs index 58e5bcae19c..5ce5c49d29f 100644 --- a/examples/counter/src/lib.rs +++ b/examples/counter/src/lib.rs @@ -1,5 +1,5 @@ use stdweb::web::Date; -use yew::{html, Component, ComponentLink, Renderable, ShouldRender}; +use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender}; use yew::services::ConsoleService; pub struct Model { diff --git a/examples/crm/Cargo.toml b/examples/crm/Cargo.toml index 09bffb09816..85a4e28e8d8 100644 --- a/examples/crm/Cargo.toml +++ b/examples/crm/Cargo.toml @@ -2,6 +2,7 @@ name = "crm" version = "0.1.0" authors = ["Denis Kolodin "] +edition = "2018" [dependencies] serde = "1" diff --git a/examples/crm/src/lib.rs b/examples/crm/src/lib.rs index 0c610b5bacf..0ff5be05bc1 100644 --- a/examples/crm/src/lib.rs +++ b/examples/crm/src/lib.rs @@ -1,13 +1,9 @@ #[macro_use] extern crate serde_derive; -#[macro_use] -extern crate yew; - -extern crate pulldown_cmark; mod markdown; -use yew::prelude::*; +use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender}; use yew::format::Json; use yew::services::{DialogService, StorageService}; use yew::services::storage::Area; diff --git a/examples/crm/src/markdown.rs b/examples/crm/src/markdown.rs index cd92d653711..ccdec31adbb 100644 --- a/examples/crm/src/markdown.rs +++ b/examples/crm/src/markdown.rs @@ -3,8 +3,7 @@ /// Source: https://github.com/acmumn/mentoring/blob/master/web-client/src/view/markdown.rs use pulldown_cmark::{Alignment, Event, Parser, Tag, OPTION_ENABLE_TABLES}; -use yew::html::Html; -use yew::html::Component; +use yew::{html, Component, Html}; use yew::virtual_dom::{VNode, VTag, VText}; /// Renders a string of Markdown to HTML with the default options (footnotes diff --git a/examples/custom_components/Cargo.toml b/examples/custom_components/Cargo.toml index 1cd74fc5a6e..0e50867b039 100644 --- a/examples/custom_components/Cargo.toml +++ b/examples/custom_components/Cargo.toml @@ -2,6 +2,7 @@ name = "custom_components" version = "0.1.0" authors = ["Denis Kolodin "] +edition = "2018" [dependencies] yew = { path = "../.." } diff --git a/examples/custom_components/src/barrier.rs b/examples/custom_components/src/barrier.rs index 80c65a4e215..dea1cd1e969 100644 --- a/examples/custom_components/src/barrier.rs +++ b/examples/custom_components/src/barrier.rs @@ -1,5 +1,5 @@ -use yew::prelude::*; -use button::Button; +use crate::button::Button; +use yew::{html, Callback, Component, ComponentLink, Html, Renderable, ShouldRender}; pub struct Barrier { limit: u32, diff --git a/examples/custom_components/src/button.rs b/examples/custom_components/src/button.rs index b2e2564ffb6..10298c223d2 100644 --- a/examples/custom_components/src/button.rs +++ b/examples/custom_components/src/button.rs @@ -1,4 +1,4 @@ -use yew::prelude::*; +use yew::{html, Callback, Component, ComponentLink, Html, Renderable, ShouldRender}; pub struct Button { title: String, diff --git a/examples/custom_components/src/counter.rs b/examples/custom_components/src/counter.rs index 8fd378bb728..7f0be85c171 100644 --- a/examples/custom_components/src/counter.rs +++ b/examples/custom_components/src/counter.rs @@ -1,4 +1,4 @@ -use yew::prelude::*; +use yew::{html, Callback, Component, ComponentLink, Html, Renderable, ShouldRender}; #[derive(PartialEq, Clone)] pub enum Color { diff --git a/examples/custom_components/src/lib.rs b/examples/custom_components/src/lib.rs index e8a71b91bbc..591a0fcfd1a 100644 --- a/examples/custom_components/src/lib.rs +++ b/examples/custom_components/src/lib.rs @@ -1,11 +1,8 @@ -#[macro_use] -extern crate yew; - mod counter; mod button; mod barrier; -use yew::prelude::*; +use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender}; use counter::{Counter, Color}; use barrier::Barrier; diff --git a/examples/dashboard/Cargo.toml b/examples/dashboard/Cargo.toml index 9b1d02a7c86..8efe5b56501 100644 --- a/examples/dashboard/Cargo.toml +++ b/examples/dashboard/Cargo.toml @@ -2,6 +2,7 @@ name = "dashboard" version = "0.1.0" authors = ["Denis Kolodin "] +edition = "2018" [dependencies] failure = "0.1" diff --git a/examples/dashboard/src/lib.rs b/examples/dashboard/src/lib.rs index da863b37012..752a937b7ae 100644 --- a/examples/dashboard/src/lib.rs +++ b/examples/dashboard/src/lib.rs @@ -1,11 +1,6 @@ -extern crate failure; -#[macro_use] -extern crate serde_derive; -#[macro_use] -extern crate yew; - use failure::Error; -use yew::prelude::*; +use serde_derive::{Deserialize, Serialize}; +use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender}; use yew::format::{Nothing, Json, Toml}; use yew::services::Task; use yew::services::fetch::{FetchService, FetchTask, Request, Response}; diff --git a/examples/fragments/Cargo.toml b/examples/fragments/Cargo.toml index 32cd11d6b96..7f481560e68 100644 --- a/examples/fragments/Cargo.toml +++ b/examples/fragments/Cargo.toml @@ -2,6 +2,7 @@ name = "fragments" version = "0.1.0" authors = ["Denis Kolodin "] +edition = "2018" [dependencies] yew = { path = "../.." } diff --git a/examples/fragments/src/lib.rs b/examples/fragments/src/lib.rs index 787820d6c02..32be33aa6ef 100644 --- a/examples/fragments/src/lib.rs +++ b/examples/fragments/src/lib.rs @@ -1,7 +1,4 @@ -#[macro_use] -extern crate yew; - -use yew::prelude::*; +use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender}; pub struct Model { counter: usize, diff --git a/examples/game_of_life/Cargo.toml b/examples/game_of_life/Cargo.toml index 498a85a07db..26677bce28c 100644 --- a/examples/game_of_life/Cargo.toml +++ b/examples/game_of_life/Cargo.toml @@ -4,11 +4,10 @@ version = "0.1.3" authors = ["Diego Cardoso ", "Ilya Bogdanov "] +edition = "2018" [dependencies] -# Temporary check -rand = { git = "https://github.com/rust-lang-nursery/rand", features = ["stdweb"] } -#rand = { version = "0.5.0-pre.1", features = ["stdweb"] } +rand = { version = "0.6.5", features = ["stdweb"] } log = "0.4" web_logger = "0.1" yew = { path = "../.." } diff --git a/examples/game_of_life/src/lib.rs b/examples/game_of_life/src/lib.rs index f5d3e95e22e..07b31ab4f89 100644 --- a/examples/game_of_life/src/lib.rs +++ b/examples/game_of_life/src/lib.rs @@ -1,13 +1,9 @@ #![recursion_limit="128"] -extern crate rand; -#[macro_use] extern crate log; -extern crate web_logger; -#[macro_use] extern crate yew; - +use log::info; use std::time::Duration; use rand::Rng; -use yew::prelude::*; +use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender}; use yew::services::{IntervalService, Task}; #[derive(Clone, Copy, PartialEq)] diff --git a/examples/game_of_life/src/main.rs b/examples/game_of_life/src/main.rs index c9832636cb7..c1115a5fa06 100644 --- a/examples/game_of_life/src/main.rs +++ b/examples/game_of_life/src/main.rs @@ -1,12 +1,13 @@ -use log::trace; -use yew::prelude::*; use game_of_life::{Model, Msg}; +use log::trace; +use yew::App; fn main() { web_logger::init(); trace!("Initializing yew..."); yew::initialize(); - App::::new().mount_to_body() + App::::new() + .mount_to_body() .send_message(Msg::Random); yew::run_loop(); } diff --git a/examples/inner_html/Cargo.toml b/examples/inner_html/Cargo.toml index dc88a0ba340..ca381ecbfd5 100644 --- a/examples/inner_html/Cargo.toml +++ b/examples/inner_html/Cargo.toml @@ -2,6 +2,7 @@ name = "inner_html" version = "0.1.0" authors = ["Garrett Berg "] +edition = "2018" [dependencies] stdweb = "0.4.2" diff --git a/examples/inner_html/src/lib.rs b/examples/inner_html/src/lib.rs index a708860400a..85efe1c2a63 100644 --- a/examples/inner_html/src/lib.rs +++ b/examples/inner_html/src/lib.rs @@ -1,12 +1,10 @@ #![recursion_limit="512"] #[macro_use] extern crate stdweb; -extern crate yew; - -use yew::prelude::*; use stdweb::web::Node; use stdweb::unstable::TryFrom; +use yew::{Component, ComponentLink, Html, Renderable, ShouldRender}; use yew::virtual_dom::VNode; pub struct Model { diff --git a/examples/js_callback/Cargo.toml b/examples/js_callback/Cargo.toml index 1727caf1d4e..5a5137a9adc 100644 --- a/examples/js_callback/Cargo.toml +++ b/examples/js_callback/Cargo.toml @@ -2,6 +2,7 @@ name = "js_callback" version = "0.1.0" authors = ["Scott Steele "] +edition = "2018" [dependencies] yew = { path = "../.." } diff --git a/examples/js_callback/src/lib.rs b/examples/js_callback/src/lib.rs index fe6277f6c43..2e9b264bcaa 100644 --- a/examples/js_callback/src/lib.rs +++ b/examples/js_callback/src/lib.rs @@ -1,12 +1,10 @@ #![deny(warnings)] -#[macro_use] -extern crate yew; -use yew::prelude::*; - #[macro_use] extern crate stdweb; +use yew::{html, Callback, Component, ComponentLink, Html, Renderable, ShouldRender}; + pub struct Model { payload: String, // Pointless field just to have something that's been manipulated diff --git a/examples/large_table/Cargo.toml b/examples/large_table/Cargo.toml index b1ac49afa70..67d7196cede 100644 --- a/examples/large_table/Cargo.toml +++ b/examples/large_table/Cargo.toml @@ -2,6 +2,7 @@ name = "large_table" version = "0.1.0" authors = ["qthree "] +edition = "2018" [dependencies] yew = { path = "../.." } diff --git a/examples/large_table/src/lib.rs b/examples/large_table/src/lib.rs index e9291dff3c4..6b186c470fb 100644 --- a/examples/large_table/src/lib.rs +++ b/examples/large_table/src/lib.rs @@ -1,10 +1,7 @@ //! This demo originally created by https://github.com/qthree //! Source: https://github.com/qthree/yew_table100x100_test -#[macro_use] -extern crate yew; - -use yew::prelude::*; +use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender}; pub struct Model { selected: Option<(u32, u32)> diff --git a/examples/mount_point/Cargo.toml b/examples/mount_point/Cargo.toml index 1479c9c855b..7fdf92c19db 100644 --- a/examples/mount_point/Cargo.toml +++ b/examples/mount_point/Cargo.toml @@ -2,6 +2,7 @@ name = "mount_point" version = "0.1.0" authors = ["Ben Berman "] +edition = "2018" [dependencies] stdweb = "0.4" diff --git a/examples/mount_point/src/lib.rs b/examples/mount_point/src/lib.rs index 6ac08101f37..61c90e311f8 100644 --- a/examples/mount_point/src/lib.rs +++ b/examples/mount_point/src/lib.rs @@ -1,7 +1,4 @@ -#[macro_use] -extern crate yew; - -use yew::prelude::*; +use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender}; pub struct Model { name: String, diff --git a/examples/mount_point/src/main.rs b/examples/mount_point/src/main.rs index c081c4d444b..211294446c4 100644 --- a/examples/mount_point/src/main.rs +++ b/examples/mount_point/src/main.rs @@ -1,5 +1,8 @@ +#[macro_use] +extern crate stdweb; + use yew::App; -use stdweb::web::{js, IElement, INode, IParentNode, document}; +use stdweb::web::{IElement, INode, IParentNode, document}; use mount_point::Model; fn main() { diff --git a/examples/multi_thread/Cargo.toml b/examples/multi_thread/Cargo.toml index 284ec2b719e..50c8ba4d187 100644 --- a/examples/multi_thread/Cargo.toml +++ b/examples/multi_thread/Cargo.toml @@ -2,6 +2,7 @@ name = "multi_thread" version = "0.1.0" authors = ["Denis Kolodin "] +edition = "2018" [dependencies] log = "0.4" diff --git a/examples/multi_thread/src/bin/main.rs b/examples/multi_thread/src/bin/main.rs index a4990217d35..1a699be56aa 100644 --- a/examples/multi_thread/src/bin/main.rs +++ b/examples/multi_thread/src/bin/main.rs @@ -1,13 +1,4 @@ -extern crate web_logger; -extern crate yew; -extern crate multi_thread; - -use yew::prelude::*; -use multi_thread::Model; - fn main() { web_logger::init(); - yew::initialize(); - App::::new().mount_to_body(); - yew::run_loop(); + yew::start_app::(); } diff --git a/examples/multi_thread/src/bin/native_worker.rs b/examples/multi_thread/src/bin/native_worker.rs index 906f589bb37..f4343ca2755 100644 --- a/examples/multi_thread/src/bin/native_worker.rs +++ b/examples/multi_thread/src/bin/native_worker.rs @@ -1,14 +1,8 @@ - -extern crate web_logger; -extern crate yew; -extern crate multi_thread; - -use yew::prelude::*; -use multi_thread::native_worker; +use yew::agent::Threaded; fn main() { web_logger::init(); yew::initialize(); - native_worker::Worker::register(); + multi_thread::native_worker::Worker::register(); yew::run_loop(); } diff --git a/examples/multi_thread/src/context.rs b/examples/multi_thread/src/context.rs index 4e2b176f1bb..e5cf4a376a8 100644 --- a/examples/multi_thread/src/context.rs +++ b/examples/multi_thread/src/context.rs @@ -1,5 +1,7 @@ +use log::info; +use serde_derive::{Deserialize, Serialize}; use std::time::Duration; -use yew::prelude::worker::*; +use yew::worker::*; // TODO use yew::services::{IntervalService, FetchService, Task}; use yew::services::Task; use yew::services::interval::IntervalService; diff --git a/examples/multi_thread/src/job.rs b/examples/multi_thread/src/job.rs index a4ac4867c8b..c821180c84a 100644 --- a/examples/multi_thread/src/job.rs +++ b/examples/multi_thread/src/job.rs @@ -1,5 +1,7 @@ +use log::info; +use serde_derive::{Deserialize, Serialize}; use std::time::Duration; -use yew::prelude::worker::*; +use yew::worker::*; // TODO use yew::services::{IntervalService, FetchService, Task}; use yew::services::Task; use yew::services::interval::IntervalService; diff --git a/examples/multi_thread/src/lib.rs b/examples/multi_thread/src/lib.rs index f42585d3048..1473ec62b10 100644 --- a/examples/multi_thread/src/lib.rs +++ b/examples/multi_thread/src/lib.rs @@ -1,15 +1,10 @@ -#[macro_use] -extern crate log; -#[macro_use] -extern crate serde_derive; -#[macro_use] -extern crate yew; - pub mod native_worker; pub mod job; pub mod context; -use yew::prelude::*; +use log::info; +use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender}; +use yew::worker::*; pub struct Model { worker: Box>, diff --git a/examples/multi_thread/src/native_worker.rs b/examples/multi_thread/src/native_worker.rs index d555bc3a03c..a2abea50fcc 100644 --- a/examples/multi_thread/src/native_worker.rs +++ b/examples/multi_thread/src/native_worker.rs @@ -1,5 +1,7 @@ +use log::info; use std::time::Duration; -use yew::prelude::worker::*; +use serde_derive::{Deserialize, Serialize}; +use yew::worker::*; // TODO use yew::services::{IntervalService, FetchService, Task}; use yew::services::Task; use yew::services::interval::IntervalService; diff --git a/examples/npm_and_rest/Cargo.toml b/examples/npm_and_rest/Cargo.toml index a1b6d8d79b3..71aa4b911f0 100644 --- a/examples/npm_and_rest/Cargo.toml +++ b/examples/npm_and_rest/Cargo.toml @@ -2,6 +2,7 @@ name = "npm_and_rest" version = "0.1.0" authors = ["Denis Kolodin "] +edition = "2018" [dependencies] failure = "0.1" diff --git a/examples/npm_and_rest/src/gravatar.rs b/examples/npm_and_rest/src/gravatar.rs index 8d2aa00bdde..6b8b0401b78 100644 --- a/examples/npm_and_rest/src/gravatar.rs +++ b/examples/npm_and_rest/src/gravatar.rs @@ -1,4 +1,5 @@ -use failure::Error; +use failure::{format_err, Error}; +use serde_derive::Deserialize; use yew::callback::Callback; use yew::format::{Json, Nothing}; use yew::services::fetch::{FetchService, FetchTask, Request, Response}; diff --git a/examples/npm_and_rest/src/lib.rs b/examples/npm_and_rest/src/lib.rs index b5e286d0db3..7330f76affb 100644 --- a/examples/npm_and_rest/src/lib.rs +++ b/examples/npm_and_rest/src/lib.rs @@ -1,18 +1,12 @@ #[macro_use] -extern crate failure; -#[macro_use] -extern crate serde_derive; -#[macro_use] extern crate stdweb; -#[macro_use] -extern crate yew; // Own services implementation pub mod gravatar; pub mod ccxt; use failure::Error; -use yew::prelude::*; +use yew::{html, Callback, Component, ComponentLink, Html, Renderable, ShouldRender}; use yew::services::fetch::FetchTask; use gravatar::{GravatarService, Profile}; diff --git a/examples/routing/Cargo.toml b/examples/routing/Cargo.toml index af2602084ee..281682e51a3 100644 --- a/examples/routing/Cargo.toml +++ b/examples/routing/Cargo.toml @@ -2,6 +2,7 @@ name = "routing" version = "0.1.0" authors = ["Henry Zimmerman "] +edition = "2018" [dependencies] log = "0.4" diff --git a/examples/routing/src/b_component.rs b/examples/routing/src/b_component.rs index dc614f58c23..a3c76cf3f08 100644 --- a/examples/routing/src/b_component.rs +++ b/examples/routing/src/b_component.rs @@ -1,14 +1,14 @@ -use router; -use router::Route; -use yew::prelude::*; -use std::usize; +use log::info; +use crate::router::{Request, Route, Router}; +use yew::{html, Bridge, Component, ComponentLink, Html, Renderable, ShouldRender}; +use yew::agent::Bridged; pub struct BModel { number: Option, sub_path: Option, - router: Box>> + router: Box>> } pub enum Msg { @@ -27,9 +27,9 @@ impl Component for BModel { fn create(_: Self::Properties, mut link: ComponentLink) -> Self { let callback = link.send_back(|route: Route<()>| Msg::HandleRoute(route)); - let mut router = router::Router::bridge(callback); + let mut router = Router::bridge(callback); - router.send(router::Request::GetCurrentRoute); + router.send(Request::GetCurrentRoute); BModel { number: None, @@ -54,14 +54,14 @@ impl Component for BModel { let fragment: Option = self.number.map(|x: usize | x.to_string()); - let route = router::Route { + let route = Route { path_segments, query: None, fragment, state: (), }; - self.router.send(router::Request::ChangeRoute(route)); + self.router.send(Request::ChangeRoute(route)); false } Msg::HandleRoute(route) => { @@ -143,4 +143,4 @@ impl BModel { /> } } -} \ No newline at end of file +} diff --git a/examples/routing/src/lib.rs b/examples/routing/src/lib.rs index 619f1fb93bb..222d9087144 100644 --- a/examples/routing/src/lib.rs +++ b/examples/routing/src/lib.rs @@ -1,19 +1,12 @@ -#[macro_use] -extern crate log; -#[macro_use] -extern crate serde_derive; -extern crate serde; -#[macro_use] -extern crate yew; -extern crate stdweb; - mod router; mod routing; mod b_component; use b_component::BModel; +use log::info; use router::Route; -use yew::prelude::*; +use yew::{html, Bridge, Component, ComponentLink, Html, Renderable, ShouldRender}; +use yew::agent::Bridged; pub enum Child { diff --git a/examples/routing/src/router.rs b/examples/routing/src/router.rs index b9e263f425a..936ae201bbc 100644 --- a/examples/routing/src/router.rs +++ b/examples/routing/src/router.rs @@ -1,18 +1,15 @@ //! Agent that exposes a usable routing interface to components. -use routing::RouteService; - -use yew::prelude::worker::*; - +use crate::routing::RouteService; +use yew::worker::*; +use log::info; +use serde_derive::{Deserialize, Serialize}; use std::collections::HashSet; - use stdweb::Value; use stdweb::JsSerialize; use stdweb::unstable::TryFrom; - use serde::Serialize; use serde::Deserialize; - use std::fmt::Debug; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize) ] diff --git a/examples/server/Cargo.toml b/examples/server/Cargo.toml index 25526014f4c..ab7cc04a2ec 100644 --- a/examples/server/Cargo.toml +++ b/examples/server/Cargo.toml @@ -2,6 +2,7 @@ name = "server" version = "0.1.0" authors = ["Denis Kolodin "] +edition = "2018" [dependencies] tungstenite = "0.5.2" diff --git a/examples/server/src/main.rs b/examples/server/src/main.rs index 65613222ac9..66e523d4673 100644 --- a/examples/server/src/main.rs +++ b/examples/server/src/main.rs @@ -1,5 +1,3 @@ -extern crate tungstenite; - use std::net::TcpListener; use std::thread::spawn; use tungstenite::server::accept; diff --git a/examples/showcase/Cargo.toml b/examples/showcase/Cargo.toml index 4a5122eee8e..6f23c0122ff 100644 --- a/examples/showcase/Cargo.toml +++ b/examples/showcase/Cargo.toml @@ -2,6 +2,7 @@ name = "showcase" version = "0.1.0" authors = ["Denis Kolodin ", "Limira"] +edition = "2018" [dependencies] log = "0.4" diff --git a/examples/showcase/src/main.rs b/examples/showcase/src/main.rs index 91c8ac017a1..5f969180213 100644 --- a/examples/showcase/src/main.rs +++ b/examples/showcase/src/main.rs @@ -1,32 +1,12 @@ #![recursion_limit="128"] -#[macro_use] -extern crate log; -extern crate web_logger; -extern crate strum; #[macro_use] extern crate strum_macros; -#[macro_use] -extern crate yew; -extern crate counter; -extern crate crm; -extern crate custom_components; -extern crate dashboard; -extern crate fragments; -extern crate game_of_life; -extern crate inner_html; -extern crate large_table; -extern crate mount_point; -extern crate npm_and_rest; -extern crate routing; -extern crate textarea; -extern crate timer; -extern crate todomvc; -extern crate two_apps; +use log::trace; use strum::IntoEnumIterator; +use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender}; use yew::components::Select; -use yew::prelude::*; use counter::Model as Counter; use crm::Model as Crm; use custom_components::Model as CustomComponents; diff --git a/examples/textarea/Cargo.toml b/examples/textarea/Cargo.toml index c94b94905a8..2f892e7bed5 100644 --- a/examples/textarea/Cargo.toml +++ b/examples/textarea/Cargo.toml @@ -2,6 +2,7 @@ name = "textarea" version = "0.1.0" authors = ["Andrew Straw "] +edition = "2018" [dependencies] yew = { path = "../.." } diff --git a/examples/textarea/src/lib.rs b/examples/textarea/src/lib.rs index 13d02bf41c7..89c62baf920 100644 --- a/examples/textarea/src/lib.rs +++ b/examples/textarea/src/lib.rs @@ -1,7 +1,4 @@ -#[macro_use] -extern crate yew; - -use yew::prelude::*; +use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender}; pub struct Model { value: String, diff --git a/examples/timer/Cargo.toml b/examples/timer/Cargo.toml index c50743d95a1..8d1e74d3df2 100644 --- a/examples/timer/Cargo.toml +++ b/examples/timer/Cargo.toml @@ -2,6 +2,7 @@ name = "timer" version = "0.1.0" authors = ["Denis Kolodin "] +edition = "2018" [dependencies] yew = { path = "../.." } diff --git a/examples/timer/src/lib.rs b/examples/timer/src/lib.rs index 9de08a49d22..b4160d5ccde 100644 --- a/examples/timer/src/lib.rs +++ b/examples/timer/src/lib.rs @@ -1,8 +1,5 @@ -#[macro_use] -extern crate yew; - use std::time::Duration; -use yew::prelude::*; +use yew::{html, Callback, Component, ComponentLink, Html, Renderable, ShouldRender}; use yew::services::{ConsoleService, IntervalService, TimeoutService, Task}; pub struct Model { diff --git a/examples/todomvc/Cargo.toml b/examples/todomvc/Cargo.toml index 8376db22dae..fca8e572e86 100644 --- a/examples/todomvc/Cargo.toml +++ b/examples/todomvc/Cargo.toml @@ -2,6 +2,7 @@ name = "todomvc" version = "0.1.0" authors = ["Denis Kolodin "] +edition = "2018" [dependencies] strum = "0.9" diff --git a/examples/todomvc/src/lib.rs b/examples/todomvc/src/lib.rs index 422fcd301f9..67d9237ff93 100644 --- a/examples/todomvc/src/lib.rs +++ b/examples/todomvc/src/lib.rs @@ -5,11 +5,10 @@ extern crate strum; extern crate strum_macros; #[macro_use] extern crate serde_derive; -#[macro_use] -extern crate yew; use strum::IntoEnumIterator; -use yew::prelude::*; +use yew::{html, Component, ComponentLink, Href, Html, Renderable, ShouldRender}; +use yew::events::IKeyboardEvent; use yew::format::Json; use yew::services::storage::{StorageService, Area}; diff --git a/examples/two_apps/Cargo.toml b/examples/two_apps/Cargo.toml index e0927c9fb97..08c7b871fe6 100644 --- a/examples/two_apps/Cargo.toml +++ b/examples/two_apps/Cargo.toml @@ -2,6 +2,7 @@ name = "two_apps" version = "0.1.0" authors = ["Denis Kolodin "] +edition = "2018" [dependencies] stdweb = "0.4" diff --git a/examples/two_apps/src/lib.rs b/examples/two_apps/src/lib.rs index aea80d908d3..eca9b70ee3f 100644 --- a/examples/two_apps/src/lib.rs +++ b/examples/two_apps/src/lib.rs @@ -1,9 +1,7 @@ /// This example demonstrates low-level usage of scopes. -#[macro_use] -extern crate yew; - -use yew::html::*; +use yew::{html, Component, ComponentLink, Html, Renderable, ShouldRender}; +use yew::html::Scope; pub struct Model { scope: Option>, diff --git a/examples/two_apps/src/main.rs b/examples/two_apps/src/main.rs index f2899e631f9..d69530b8736 100644 --- a/examples/two_apps/src/main.rs +++ b/examples/two_apps/src/main.rs @@ -1,5 +1,5 @@ use stdweb::web::{IParentNode, document}; -use yew::prelude::*; +use yew::App; use yew::html::Scope; use two_apps::{Model, Msg};