Update all examples to Rust 2018

yewstack · Feb 2, 2019 · 6de54c1 · 6de54c1
1 parent f99692d
commit 6de54c1
Show file tree

Hide file tree

Showing 54 changed files with 91 additions and 160 deletions.
diff --git 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
@@ -2,6 +2,7 @@
 name = "counter"
 version = "0.1.1"
 authors = ["Denis Kolodin <deniskolodin@gmail.com>"]
+edition = "2018"
 
 [dependencies]
 stdweb = "0.4.2"

diff --git 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
@@ -2,6 +2,7 @@
 name = "crm"
 version = "0.1.0"
 authors = ["Denis Kolodin <deniskolodin@gmail.com>"]
+edition = "2018"
 
 [dependencies]
 serde = "1"

diff --git 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
@@ -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
@@ -2,6 +2,7 @@
 name = "custom_components"
 version = "0.1.0"
 authors = ["Denis Kolodin <deniskolodin@gmail.com>"]
+edition = "2018"
 
 [dependencies]
 yew = { path = "../.." }
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -2,6 +2,7 @@
 name = "dashboard"
 version = "0.1.0"
 authors = ["Denis Kolodin <deniskolodin@gmail.com>"]
+edition = "2018"
 
 [dependencies]
 failure = "0.1"

diff --git 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
@@ -2,6 +2,7 @@
 name = "fragments"
 version = "0.1.0"
 authors = ["Denis Kolodin <deniskolodin@gmail.com>"]
+edition = "2018"
 
 [dependencies]
 yew = { path = "../.." }
diff --git 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
@@ -4,11 +4,10 @@ version = "0.1.3"
 authors = ["Diego Cardoso <dige0card0s0@hotmail.com>",
            "Ilya Bogdanov <fumlead@gmail.com",
            "Junjie Huang <huangjj.27@qq.com>"]
+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
@@ -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
@@ -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::<game_of_life::Model>::new().mount_to_body()
+    App::<Model>::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
@@ -2,6 +2,7 @@
 name = "inner_html"
 version = "0.1.0"
 authors = ["Garrett Berg <vitiral@gmail.com>"]
+edition = "2018"
 
 [dependencies]
 stdweb = "0.4.2"

diff --git 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
@@ -2,6 +2,7 @@
 name = "js_callback"
 version = "0.1.0"
 authors = ["Scott Steele <scottlsteele@gmail.com>"]
+edition = "2018"
 
 [dependencies]
 yew = { path = "../.." }

diff --git 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
@@ -2,6 +2,7 @@
 name = "large_table"
 version = "0.1.0"
 authors = ["qthree <qthree3@gmail.com>"]
+edition = "2018"
 
 [dependencies]
 yew = { path = "../.." }
diff --git 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
@@ -2,6 +2,7 @@
 name = "mount_point"
 version = "0.1.0"
 authors = ["Ben Berman <ben@standardbots.com>"]
+edition = "2018"
 
 [dependencies]
 stdweb = "0.4"

diff --git 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
@@ -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
@@ -2,6 +2,7 @@
 name = "multi_thread"
 version = "0.1.0"
 authors = ["Denis Kolodin <deniskolodin@gmail.com>"]
+edition = "2018"
 
 [dependencies]
 log = "0.4"

diff --git 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::<Model>::new().mount_to_body();
-    yew::run_loop();
+    yew::start_app::<multi_thread::Model>();
 }
diff --git 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
@@ -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
@@ -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
@@ -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<Bridge<native_worker::Worker>>,

diff --git 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
@@ -2,6 +2,7 @@
 name = "npm_and_rest"
 version = "0.1.0"
 authors = ["Denis Kolodin <deniskolodin@gmail.com>"]
+edition = "2018"
 
 [dependencies]
 failure = "0.1"

diff --git 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
@@ -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};