port more examples

hello-world/Cargo.toml

@@ -2,10 +2,9 @@
 name = "hello-world"
 version = "0.1.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-workspace = "../"
+workspace = ".."
+edition = "2018"
 
 [dependencies]
-env_logger = "0.5"
+env_logger = "0.6"
-
+actix-web = { git="https://github.com/actix/actix-web.git", branch = "1.0" }
-actix = "0.7"
-actix-web = "^0.7"

hello-world/src/main.rs

@@ -1,29 +1,21 @@
-extern crate actix;
+use actix_web::{middleware, web, App, HttpRequest, HttpServer};
-extern crate actix_web;
-extern crate env_logger;
 
-use actix_web::{middleware, server, App, HttpRequest};
+fn index(req: HttpRequest) -> &'static str {
-
+    println!("REQ: {:?}", req);
-fn index(_req: &HttpRequest) -> &'static str {
     "Hello world!"
 }
 
-fn main() {
+fn main() -> std::io::Result<()> {
-    ::std::env::set_var("RUST_LOG", "actix_web=info");
+    std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
-    let sys = actix::System::new("hello-world");
 
-    server::new(|| {
+    HttpServer::new(|| {
         App::new()
             // enable logger
             .middleware(middleware::Logger::default())
-            .resource("/index.html", |r| r.f(|_| "Hello world!"))
+            .service(web::resource("/index.html").to(|| "Hello world!"))
-            .resource("/", |r| r.f(index))
+            .service(web::resource("/").to(index))
     })
-    .bind("127.0.0.1:8080")
+    .bind("127.0.0.1:8080")?
-    .unwrap()
+    .run()
-    .start();
-
-    println!("Started http server: 127.0.0.1:8080");
-    let _ = sys.run();
 }

rustfmt.toml

@@ -1,5 +1,2 @@
 max_width = 89
 reorder_imports = true
-#wrap_comments = true
-fn_args_density = "Compressed"
-#use_small_heuristics = false

static_index/Cargo.toml

@@ -2,11 +2,12 @@
 name = "static_index"
 version = "0.1.0"
 authors = ["Jose Marinez <digeratus@gmail.com>"]
-workspace = "../"
+workspace = ".."
+edition = "2018"
 
 [dependencies]
 futures = "0.1"
 env_logger = "0.5"
 
-actix = "0.7"
+actix-web = { git="https://github.com/actix/actix-web.git", branch = "1.0" }
-actix-web = "0.7"
+actix-files = { git="https://github.com/actix/actix-web.git", branch = "1.0" }

static_index/src/main.rs

@@ -1,31 +1,19 @@
-extern crate actix;
+use actix_files as fs;
-extern crate actix_web;
+use actix_web::{middleware, App, HttpServer};
-extern crate env_logger;
 
-use actix_web::{fs, middleware, server, App};
+fn main() -> std::io::Result<()> {
-
+    std::env::set_var("RUST_LOG", "actix_web=info");
-fn main() {
-    ::std::env::set_var("RUST_LOG", "actix_web=info");
-    ::std::env::set_var("RUST_BACKTRACE", "1");
     env_logger::init();
 
-    let sys = actix::System::new("static_index");
+    HttpServer::new(|| {
-
-    server::new(|| {
         App::new()
             // enable logger
             .middleware(middleware::Logger::default())
-            .handler(
+            .service(
-                "/",
+                // static files
-                fs::StaticFiles::new("./static/")
+                fs::Files::new("/", "./static/").index_file("index.html"),
-                    .unwrap()
-                    .index_file("index.html"),
             )
     })
-    .bind("127.0.0.1:8080")
+    .bind("127.0.0.1:8080")?
-    .expect("Can not start server on given IP/Port")
+    .run()
-    .start();
-
-    println!("Started http server: 127.0.0.1:8080");
-    let _ = sys.run();
 }

template_askama/Cargo.toml

@@ -2,14 +2,13 @@
 name = "template-askama"
 version = "0.1.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-workspace = "../"
+workspace = ".."
+edition = "2018"
 
 [dependencies]
-env_logger = "0.5"
+env_logger = "0.6"
 askama = "0.6"
-
+actix-web = { git="https://github.com/actix/actix-web.git", branch = "1.0" }
-actix = "0.7"
-actix-web = "0.7"
 
 [build-dependencies]
 askama = "0.6"

template_askama/src/main.rs

@@ -1,11 +1,9 @@
-extern crate actix;
-extern crate actix_web;
 #[macro_use]
 extern crate askama;
 
 use std::collections::HashMap;
 
-use actix_web::{http, server, App, HttpResponse, Query, Result};
+use actix_web::{web, App, HttpResponse, HttpServer, Result};
 use askama::Template;
 
 #[derive(Template)]
@@ -19,7 +17,7 @@ struct UserTemplate<'a> {
 #[template(path = "index.html")]
 struct Index;
 
-fn index(query: Query<HashMap<String, String>>) -> Result<HttpResponse> {
+fn index(query: web::Query<HashMap<String, String>>) -> Result<HttpResponse> {
     let s = if let Some(name) = query.get("name") {
         UserTemplate {
             name: name,
@@ -33,17 +31,11 @@ fn index(query: Query<HashMap<String, String>>) -> Result<HttpResponse> {
     Ok(HttpResponse::Ok().content_type("text/html").body(s))
 }
 
-fn main() {
+fn main() -> std::io::Result<()> {
-    let sys = actix::System::new("template-askama");
-
     // start http server
-    server::new(move || {
+    HttpServer::new(move || {
-        App::new().resource("/", |r| r.method(http::Method::GET).with(index))
+        App::new().service(web::resource("/").route(web::get()).to(index))
     })
-    .bind("127.0.0.1:8080")
+    .bind("127.0.0.1:8080")?
-    .unwrap()
+    .run()
-    .start();
-
-    println!("Started http server: 127.0.0.1:8080");
-    let _ = sys.run();
 }

template_tera/Cargo.toml

@@ -2,10 +2,10 @@
 name = "template-tera"
 version = "0.1.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
-workspace = "../"
+workspace = ".."
+edition = "2018"
 
 [dependencies]
-env_logger = "0.5"
+env_logger = "0.6"
 tera = "*"
-actix = "0.7"
+actix-web = { git="https://github.com/actix/actix-web.git", branch = "1.0" }
-actix-web = "0.7"

template_tera/src/main.rs

@@ -1,58 +1,42 @@
-extern crate actix;
-extern crate actix_web;
-extern crate env_logger;
 #[macro_use]
 extern crate tera;
 
 use std::collections::HashMap;
 
-use actix_web::{
+use actix_web::{error, middleware, web, App, Error, HttpResponse, HttpServer};
-    error, http, middleware, server, App, Error, HttpResponse, Query, State,
-};
-
-struct AppState {
-    template: tera::Tera, // <- store tera template in application state
-}
 
+// store tera template in application state
 fn index(
-    (state, query): (State<AppState>, Query<HashMap<String, String>>),
+    tmpl: web::State<tera::Tera>,
+    query: web::Query<HashMap<String, String>>,
 ) -> Result<HttpResponse, Error> {
     let s = if let Some(name) = query.get("name") {
-        // <- submitted form
+        // submitted form
         let mut ctx = tera::Context::new();
-        ctx.add("name", &name.to_owned());
+        ctx.insert("name", &name.to_owned());
-        ctx.add("text", &"Welcome!".to_owned());
+        ctx.insert("text", &"Welcome!".to_owned());
-        state
+        tmpl.render("user.html", &ctx)
-            .template
-            .render("user.html", &ctx)
             .map_err(|_| error::ErrorInternalServerError("Template error"))?
     } else {
-        state
+        tmpl.render("index.html", &tera::Context::new())
-            .template
-            .render("index.html", &tera::Context::new())
             .map_err(|_| error::ErrorInternalServerError("Template error"))?
     };
     Ok(HttpResponse::Ok().content_type("text/html").body(s))
 }
 
-fn main() {
+fn main() -> std::io::Result<()> {
-    ::std::env::set_var("RUST_LOG", "actix_web=info");
+    std::env::set_var("RUST_LOG", "actix_web=info");
     env_logger::init();
-    let sys = actix::System::new("tera-example");
 
-    server::new(|| {
+    HttpServer::new(|| {
         let tera =
             compile_templates!(concat!(env!("CARGO_MANIFEST_DIR"), "/templates/**/*"));
 
-        App::with_state(AppState { template: tera })
+        App::new()
-            // enable logger
+            .state(tera)
-            .middleware(middleware::Logger::default())
+            .middleware(middleware::Logger::default()) // enable logger
-            .resource("/", |r| r.method(http::Method::GET).with(index))
+            .service(web::resource("/").route(web::get().to(index)))
     })
-    .bind("127.0.0.1:8080")
+    .bind("127.0.0.1:8080")?
-    .unwrap()
+    .run()
-    .start();
-
-    println!("Started http server: 127.0.0.1:8080");
-    let _ = sys.run();
 }