From e7ee2a06ab15bac1c64edcd56f3d32d999f3ce09 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Thu, 20 Jun 2024 01:37:37 +0100 Subject: [PATCH] docs: split chat example --- actix-ws/Cargo.toml | 6 +-- actix-ws/examples/chat.html | 69 ++++++++++++++++++++++++++++++++++ actix-ws/examples/chat.rs | 75 +++---------------------------------- 3 files changed, 77 insertions(+), 73 deletions(-) create mode 100644 actix-ws/examples/chat.html diff --git a/actix-ws/Cargo.toml b/actix-ws/Cargo.toml index 7b7425af5..d489fa0cd 100644 --- a/actix-ws/Cargo.toml +++ b/actix-ws/Cargo.toml @@ -23,9 +23,9 @@ tokio = { version = "1", features = ["sync"] } [dev-dependencies] actix-rt = "2.6" -actix-web = "4.0.1" -anyhow = "1.0" -futures-util = "0.3.17" +actix-web = "4.8" +anyhow = "1" +futures-util = { version = "0.3.17", default-features = false, features = ["std"] } log = "0.4" pretty_env_logger = "0.5" tokio = { version = "1", features = ["sync"] } diff --git a/actix-ws/examples/chat.html b/actix-ws/examples/chat.html new file mode 100644 index 000000000..3d6ea1266 --- /dev/null +++ b/actix-ws/examples/chat.html @@ -0,0 +1,69 @@ + + + + Chat + + + + + + + diff --git a/actix-ws/examples/chat.rs b/actix-ws/examples/chat.rs index ea034df89..cea98e2a7 100644 --- a/actix-ws/examples/chat.rs +++ b/actix-ws/examples/chat.rs @@ -3,7 +3,9 @@ use std::{ time::{Duration, Instant}, }; -use actix_web::{middleware::Logger, web, App, HttpRequest, HttpResponse, HttpServer}; +use actix_web::{ + middleware::Logger, web, web::Html, App, HttpRequest, HttpResponse, HttpServer, Responder, +}; use actix_ws::{Message, Session}; use futures_util::{stream::FuturesUnordered, StreamExt as _}; use log::info; @@ -116,75 +118,8 @@ async fn ws( Ok(response) } -async fn index() -> HttpResponse { - let s = r#" - - - - Chat - - - - - - - - "#; - - HttpResponse::Ok().content_type("text/html").body(s) +async fn index() -> impl Responder { + Html::new(include_str!("chat.html").to_owned()) } #[actix_rt::main]