From 9587261c2099ea46182147c7f8807f8b1055448e Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Tue, 7 Dec 2021 15:31:15 +0000
Subject: [PATCH] add fakeshadow's actix-web in actix-http example

---
 actix-http/Cargo.toml            |  3 ++-
 actix-http/examples/actix-web.rs | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 actix-http/examples/actix-web.rs

diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index 87669aeb..6216af3d 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -84,6 +84,7 @@ zstd = { version = "0.9", optional = true }
 actix-server = "2.0.0-rc.1"
 actix-http-test = { version = "3.0.0-beta.7", features = ["openssl"] }
 actix-tls = { version = "3.0.0-rc.1", features = ["openssl"] }
+actix-web = "4.0.0-beta.13"
 async-stream = "0.3"
 criterion = { version = "0.3", features = ["html_reports"] }
 env_logger = "0.9"
@@ -95,7 +96,7 @@ serde_json = "1.0"
 static_assertions = "1"
 tls-openssl = { package = "openssl", version = "0.10.9" }
 tls-rustls = { package = "rustls", version = "0.20.0" }
-tokio = { version = "1.2", features = ["net", "rt"] }
+tokio = { version = "1.2", features = ["net", "rt", "macros"] }
 
 [[example]]
 name = "ws"
diff --git a/actix-http/examples/actix-web.rs b/actix-http/examples/actix-web.rs
new file mode 100644
index 00000000..f8226507
--- /dev/null
+++ b/actix-http/examples/actix-web.rs
@@ -0,0 +1,26 @@
+use actix_http::HttpService;
+use actix_server::Server;
+use actix_service::map_config;
+use actix_web::{dev::AppConfig, get, App};
+
+#[get("/")]
+async fn index() -> &'static str {
+    "Hello, world. From Actix Web!"
+}
+
+#[tokio::main(flavor = "current_thread")]
+async fn main() -> std::io::Result<()> {
+    Server::build()
+        .bind("hello-world", "127.0.0.1:8080", || {
+            // construct actix-web app
+            let app = App::new().service(index);
+
+            HttpService::build()
+                // pass the app to service builder
+                // map_config is used to map App's configuration to ServiceBuilder
+                .finish(map_config(app, |_| AppConfig::default()))
+                .tcp()
+        })?
+        .run()
+        .await
+}