diff --git a/src/client/connector.rs b/src/client/connector.rs index 6323649c7..7778fe9b1 100644 --- a/src/client/connector.rs +++ b/src/client/connector.rs @@ -140,7 +140,7 @@ impl ClientConnector { /// /// Arbiter::handle().spawn({ /// conn.call_fut( - /// Connect::new("https://www.rust-lang.org").unwrap()) // <- connecto to host + /// Connect::new("https://www.rust-lang.org").unwrap()) // <- connect to host /// .map_err(|_| ()) /// .and_then(|res| { /// if let Ok(mut stream) = res { diff --git a/src/middleware/cors.rs b/src/middleware/cors.rs index ad5f295c6..d80cbd4f7 100644 --- a/src/middleware/cors.rs +++ b/src/middleware/cors.rs @@ -579,7 +579,7 @@ impl CorsBuilder { /// Set a wildcard origins /// - /// If send widlcard is set and the `allowed_origins` parameter is `All`, a wildcard + /// If send wildcard is set and the `allowed_origins` parameter is `All`, a wildcard /// `Access-Control-Allow-Origin` response header is sent, rather than the request’s /// `Origin` header. /// @@ -603,7 +603,7 @@ impl CorsBuilder { /// If true, injects the `Access-Control-Allow-Credentials` header in responses. /// This allows cookies and credentials to be submitted across domains. /// - /// This option cannot be used in conjuction with an `allowed_origin` set to `All` + /// This option cannot be used in conjunction with an `allowed_origin` set to `All` /// and `send_wildcards` set to `true`. /// /// Defaults to `false`. diff --git a/src/pipeline.rs b/src/pipeline.rs index fb3c9b0b0..d1328ad99 100644 --- a/src/pipeline.rs +++ b/src/pipeline.rs @@ -689,7 +689,7 @@ impl Completed { #[inline] fn init(info: &mut PipelineInfo) -> PipelineState { if let Some(ref err) = info.error { - error!("Error occured during request handling: {}", err); + error!("Error occurred during request handling: {}", err); } if info.context.is_none() { diff --git a/src/route.rs b/src/route.rs index 542b4b18e..bd721b1c6 100644 --- a/src/route.rs +++ b/src/route.rs @@ -127,7 +127,7 @@ impl InnerHandler { #[inline] pub fn handle(&self, req: HttpRequest) -> Reply { // reason: handler is unique per thread, - // handler get called from async code, and handler doesnt have side effects + // handler get called from async code, and handler doesn't have side effects #[allow(mutable_transmutes)] #[cfg_attr(feature = "cargo-clippy", allow(borrowed_box))] let h: &mut Box> = unsafe { mem::transmute(self.0.as_ref()) }; diff --git a/src/ws/client.rs b/src/ws/client.rs index 5de25c606..7e4c4f9b1 100644 --- a/src/ws/client.rs +++ b/src/ws/client.rs @@ -35,7 +35,7 @@ pub type WsClientFuture = Future; -/// Websockt client error +/// Websocket client error #[derive(Fail, Debug)] pub enum WsClientError { #[fail(display="Invalid url")]