fix: test

Author: NewbMiao

.github/workflows/check_guides.sh

@@ -23,6 +23,7 @@ EOF
     tokio = { version = "1", features = ["full"] }
     http-body-util = "0.1"
     hyper-util = { version = "0.1", features = ["full"] }
+    tower = "0.4"
 EOF
             cargo build --manifest-path "$value/Cargo.toml"
         fi

_config.yml

@@ -57,6 +57,7 @@ docs_url: https://docs.rs/hyper
 examples_url: https://github.com/hyperium/hyper/tree/master/examples
 http_body_util_url: https://docs.rs/http-body-util
 hyper_tls_url: https://docs.rs/hyper-tls
+hyper_util_url: https://docs.rs/hyper-util
 
 futures_url: https://docs.rs/futures/0.3.*
 legacy_docs_url: https://docs.rs/hyper/0.14.*

_stable/server/middleware.md

@@ -3,35 +3,39 @@ title: Getting Started with a Server Middleware
 layout: guide
 ---
 
-As [Upgrade](https://hyper.rs/guides/1/upgrading/) mentioned, hyper v1 is not depended on tower for the Service trait. When we want to add tower-like middleware, there are 2 kind of approach to make it.
+As [Upgrade](upgrading) mentioned, hyper v1 is not depended on tower for the Service trait. When we want to add tower-like middleware, there are 2 kind of approach to make it.
 
-Let's create a Logger middleware in [hello-world server](https://hyper.rs/guides/1/server/hello-world/) for instance:
+Let's create a Logger middleware in [hello-world server](hello-world) for instance:
 
 Add tower dependency first
 
-```rust
+```toml
 [dependencies]
 hyper = { version = "1", features = ["full"] }
 tokio = { version = "1", features = ["full"] }
 http-body-util = "0.1"
 hyper-util = { version = "0.1", features = ["full"] }
-tower = { version = "0.4.13" } // here
+tower = "0.4" # here
 ```
 
 ## Option 1: Use hyper Service trait
 
 Implement hyper Logger middleware
 
 ```rust
-use hyper::{body::Incoming, service::Service}; // using hyper Service trait
-use tower::{Layer, Service};
+# extern crate hyper;
+use hyper::{Request, body::Incoming, service::Service};
 
 #[derive(Debug, Clone)]
 pub struct Logger<S> {
     inner: S,
 }
-
-type Req = hyper::Request<Incoming>;
+impl<S> Logger<S> {
+    pub fn new(inner: S) -> Self {
+        Logger { inner }
+    }
+}
+type Req = Request<Incoming>;
 
 impl<S> Service<Req> for Logger<S>
 where
@@ -45,23 +49,53 @@ where
         self.inner.call(req)
     }
 }
+# fn main() {}
 ```
 
 Then this can be used in server:
 
 ```rust
+# extern crate tower;
+# extern crate hyper;
+# extern crate http_body_util;
+# extern crate tokio;
+# extern crate hyper_util;
+# mod no_run {
 use std::{convert::Infallible, net::SocketAddr};
-
 use hyper::{
+    service::Service,
     body::{Bytes, Incoming},
     server::conn::http1,
     Request, Response,
 };
-
 use http_body_util::Full;
 use hyper_util::rt::TokioIo;
 use tokio::net::TcpListener;
 use tower::ServiceBuilder;
+
+# #[derive(Debug, Clone)]
+# pub struct Logger<S> {
+#     inner: S,
+# }
+# impl<S> Logger<S> {
+#    pub fn new(inner: S) -> Self {
+#        Logger { inner }
+#    }
+# }
+# type Req = Request<Incoming>;
+
+# impl<S> Service<Req> for Logger<S>
+# where
+#     S: Service<Req>,
+# {
+#     type Response = S::Response;
+#     type Error = S::Error;
+#     type Future = S::Future;
+#     fn call(&self, req: Req) -> Self::Future {
+#         println!("processing request: {} {}", req.method(), req.uri().path());
+#         self.inner.call(req)
+#     }
+# }
 async fn hello(_: Request<Incoming>) -> Result<Response<Full<Bytes>>, Infallible> {
     Ok(Response::new(Full::new(Bytes::from("Hello, World!"))))
 }
@@ -82,16 +116,20 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         });
     }
 }
+# }
+# fn main() {}
 ```
 
 ## Option 2: use hyper TowerToHyperService trait
 
-[hyper_util::service::TowerToHyperService](https://docs.rs/hyper-util/latest/hyper_util/service/struct.TowerToHyperService.html) trait is an adapter to convert tower Service to hyper Service.
+[hyper_util::service::TowerToHyperService](adapter-trait) trait is an adapter to convert tower Service to hyper Service.
 
 Now implement a tower Logger middleware
 
 ```rust
-use hyper::body::Incoming;
+# extern crate tower;
+# extern crate hyper;
+use hyper::{Request, body::Incoming};
 use tower::Service;
 
 #[derive(Debug, Clone)]
@@ -103,7 +141,7 @@ impl<S> Logger<S> {
         Logger { inner }
     }
 }
-type Req = hyper::Request<Incoming>;
+type Req = Request<Incoming>;
 impl<S> Service<Req> for Logger<S>
 where
     S: Service<Req> + Clone,
@@ -126,11 +164,18 @@ where
         self.inner.call(req)
     }
 }
+# fn main() {}
 ```
 
 Then use it in the server:
 
 ```rust
+# extern crate hyper;
+# extern crate http_body_util;
+# extern crate hyper_util;
+# extern crate tokio;
+# extern crate tower;
+# mod no_run {
 use std::{convert::Infallible, net::SocketAddr};
 
 use hyper::{
@@ -142,8 +187,41 @@ use hyper::{
 use http_body_util::Full;
 use hyper_util::{rt::TokioIo, service::TowerToHyperService};
 use tokio::net::TcpListener;
-use tower::ServiceBuilder;
-use crate::logger::Logger as Logger;
+use tower::{ServiceBuilder, Service};
+
+# #[derive(Debug, Clone)]
+# pub struct Logger<S> {
+#     inner: S,
+# }
+# impl<S> Logger<S> {
+#     pub fn new(inner: S) -> Self {
+#         Logger { inner }
+#     }
+# }
+# type Req = Request<Incoming>;
+# impl<S> Service<Req> for Logger<S>
+# where
+#     S: Service<Req> + Clone,
+# {
+#     type Response = S::Response;
+
+#     type Error = S::Error;
+
+#     type Future = S::Future;
+
+#     fn poll_ready(
+#         &mut self,
+#         cx: &mut std::task::Context<'_>,
+#     ) -> std::task::Poll<Result<(), Self::Error>> {
+#         self.inner.poll_ready(cx)
+#     }
+
+#     fn call(&mut self, req: Req) -> Self::Future {
+#         println!("processing request: {} {}", req.method(), req.uri().path());
+#         self.inner.call(req)
+#     }
+# }
+
 async fn hello(_: Request<Incoming>) -> Result<Response<Full<Bytes>>, Infallible> {
     Ok(Response::new(Full::new(Bytes::from("Hello, World!"))))
 }
@@ -166,4 +244,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
         });
     }
 }
+}
+# fn main() {}
 ```
+
+[hellp-world]: {{ site.url }}/guides/1/server/hello-world/
+[upgrading]: {{ site.url }}/guides/1/upgrading/
+[adapter-trait]: {{ site.hyper_util_url }}/latest/hyper_util/service/struct.TowerToHyperService.html