From 8aa39e1afb83deca0c86ca5adcedf3c983bdca2d Mon Sep 17 00:00:00 2001
From: Cameron Dershem <cameron@pinkhatbeard.com>
Date: Wed, 12 Jun 2019 04:51:45 -0400
Subject: [PATCH] begin update of docs to actix-web 1.0

---
 config.toml                          |  2 +-
 content/docs/getting-started.md      |  5 +++--
 content/docs/installation.md         |  4 ++--
 examples/application/Cargo.toml      |  2 +-
 examples/getting-started/Cargo.toml  |  2 +-
 examples/getting-started/src/main.rs | 30 ++++++++++++++++++++++------
 examples/server/Cargo.toml           |  2 +-
 examples/url-dispatch/Cargo.toml     |  2 +-
 layouts/index.html                   | 18 ++++++++---------
 9 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/config.toml b/config.toml
index 5f25122..e815c7e 100644
--- a/config.toml
+++ b/config.toml
@@ -16,4 +16,4 @@ baseURL = "https://actix.rs"
 
 [params]
 actixVersion = "0.7"
-actixWebVersion = "0.7"
+actixWebVersion = "1.0"
diff --git a/content/docs/getting-started.md b/content/docs/getting-started.md
index b0833e6..50b6a34 100644
--- a/content/docs/getting-started.md
+++ b/content/docs/getting-started.md
@@ -27,6 +27,7 @@ actix-web = "{{< actix-version "actix-web" >}}"
 
 In order to implement a web server, we first need to create a request handler.
 
+<!-- TODO: Handler has been deprecated -->
 A request handler is a function that accepts an `HttpRequest` instance as its only parameter
 and returns a type that can be converted into `HttpResponse`:
 
@@ -34,12 +35,12 @@ Filename: `src/main.rs`
 
 {{< include-example example="getting-started" section="setup" >}}
 
+<!-- TODO: Return ->
 Next, create an `Application` instance and register the request handler with
 the application's `resource` on a particular *HTTP method* and *path* and
 after that, the application instance can be used with `HttpServer` to listen
 for incoming connections. The server accepts a function that should return an
-`HttpHandler` instance.  For simplicity `server::new` could be used, this
-function is shortcut for `HttpServer::new`:
+`HttpResponse`.
 
 {{< include-example example="getting-started" section="main" >}}
 
diff --git a/content/docs/installation.md b/content/docs/installation.md
index 6664ffc..a4e09b3 100644
--- a/content/docs/installation.md
+++ b/content/docs/installation.md
@@ -9,7 +9,7 @@ weight: 110
 Since `actix-web` is a Rust framework you will need Rust to get started with it.
 If you don't have it yet we recommend you use `rustup` to manage your Rust
 installation.  The [official rust
-guide](https://doc.rust-lang.org/book/second-edition/ch01-01-installation.html)
+guide](https://doc.rust-lang.org/book/ch01-01-installation.html)
 has a wonderful section on getting started.
 
 We currently require at least Rust 1.24 so make sure you run `rustup update`
@@ -18,7 +18,7 @@ guide will assume that you actually run Rust 1.26 or later.
 
 # Installing `actix-web`
 
-Thank's to Rust's `cargo` package manager you won't need to explicitly install
+Thanks to Rust's `cargo` package manager you won't need to explicitly install
 `actix-web`.  Just depend on it and you're ready to go.  For the unlikely
 case that you want to use the development version of actix-web you can
 depend on the git repository directly.
diff --git a/examples/application/Cargo.toml b/examples/application/Cargo.toml
index 9488e4d..a201c1d 100644
--- a/examples/application/Cargo.toml
+++ b/examples/application/Cargo.toml
@@ -4,4 +4,4 @@ version = "0.7.0"
 workspace = "../"
 
 [dependencies]
-actix-web = "0.7"
+actix-web = "1.0"
diff --git a/examples/getting-started/Cargo.toml b/examples/getting-started/Cargo.toml
index 226c730..ee5e823 100644
--- a/examples/getting-started/Cargo.toml
+++ b/examples/getting-started/Cargo.toml
@@ -4,4 +4,4 @@ version = "0.7.0"
 workspace = "../"
 
 [dependencies]
-actix-web = "0.7"
+actix-web = "1.0"
diff --git a/examples/getting-started/src/main.rs b/examples/getting-started/src/main.rs
index 494bec4..05fc5f2 100644
--- a/examples/getting-started/src/main.rs
+++ b/examples/getting-started/src/main.rs
@@ -1,16 +1,34 @@
+// // <setup>
+// extern crate actix_web;
+// use actix_web::{server, App, HttpRequest};
+
+// fn index(_req: &HttpRequest) -> &'static str {
+//     "Hello world!"
+// }
+// // </setup>
+// // <main>
+// fn main() {
+//     server::new(|| App::new().resource("/", |r| r.f(index)))
+//         .bind("127.0.0.1:8088")
+//         .unwrap()
+//         .run();
+// }
+// // </main>
+
 // <setup>
 extern crate actix_web;
-use actix_web::{server, App, HttpRequest};
+use actix_web::{web, App, HttpRequest, HttpResponse, HttpServer};
 
-fn index(_req: &HttpRequest) -> &'static str {
-    "Hello world!"
+fn index(_req: HttpRequest) -> HttpResponse {
+    HttpResponse::Ok().body("Hello world!")
 }
 // </setup>
 // <main>
 fn main() {
-    server::new(|| App::new().resource("/", |r| r.f(index)))
-        .bind("127.0.0.1:8088")
+    HttpServer::new(|| App::new().service(web::resource("/").to(index)))
+        .bind("127.0.0.1:8000")
         .unwrap()
-        .run();
+        .run()
+        .unwrap();
 }
 // </main>
diff --git a/examples/server/Cargo.toml b/examples/server/Cargo.toml
index 94e8f33..56a56a3 100644
--- a/examples/server/Cargo.toml
+++ b/examples/server/Cargo.toml
@@ -5,6 +5,6 @@ workspace = "../"
 
 [dependencies]
 actix = "0.7"
-actix-web = { version="0.7", features=["alpn"] }
+actix-web = "1.0"
 futures = "0.1"
 openssl = "0.10"
diff --git a/examples/url-dispatch/Cargo.toml b/examples/url-dispatch/Cargo.toml
index b6d081c..f73460f 100644
--- a/examples/url-dispatch/Cargo.toml
+++ b/examples/url-dispatch/Cargo.toml
@@ -5,7 +5,7 @@ workspace = "../"
 
 [dependencies]
 actix = "0.7"
-actix-web = "0.7"
+actix-web = "1.0"
 futures = "0.1"
 openssl = "0.10"
 serde = "1.0"
diff --git a/layouts/index.html b/layouts/index.html
index 9751979..647536d 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -39,23 +39,23 @@
     </div>
     <div class="col-md-8">
       <div class="actix-content">
-          {{ highlight `extern crate actix_web;
-use actix_web::{server, App, HttpRequest, Responder};
+        {{ highlight `use actix_web::{web, App, HttpRequest, HttpResponse, HttpServer};
 
-fn greet(req: &HttpRequest) -> impl Responder {
-    let to = req.match_info().get("name").unwrap_or("World");
-    format!("Hello {}!", to)
+fn greet(req: HttpRequest) -> HttpResponse {
+    let name = req.match_info().get("name").unwrap_or("World");
+    HttpResponse::Ok().body(format!("Hello {}!", &name))
 }
 
 fn main() {
-    server::new(|| {
+    HttpServer::new(|| {
         App::new()
-            .resource("/", |r| r.f(greet))
-            .resource("/{name}", |r| r.f(greet))
+            .service(web::resource("/").to(greet))
+            .service(web::resource("/{name}").to(greet))
     })
     .bind("127.0.0.1:8000")
     .expect("Can not bind to port 8000")
-    .run();
+    .run()
+    .unwrap();
 }` "rust" "" }}
         </div>
       </div>