actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2024-11-24 08:22:59 +01:00
Code Issues Releases Wiki Activity

Merge pull request #64 from andreevlex/fix-2

Browse Source 
spelling check
This commit is contained in:
Nikolay Kim 2018-01-31 10:54:05 -08:00 committed by GitHub
commit 5115384501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/connector.rs
View File

@ -140,7 +140,7 @@ impl ClientConnector {
/// ///
/// Arbiter::handle().spawn({ /// Arbiter::handle().spawn({
/// conn.call_fut( /// 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(|_| ()) /// .map_err(|_| ())
/// .and_then(|res| { /// .and_then(|res| {
/// if let Ok(mut stream) = res { /// if let Ok(mut stream) = res {

4
src/middleware/cors.rs
View File

@ -579,7 +579,7 @@ impl CorsBuilder {
/// Set a wildcard origins /// 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 /// `Access-Control-Allow-Origin` response header is sent, rather than the request’s
/// `Origin` header. /// `Origin` header.
/// ///
@ -603,7 +603,7 @@ impl CorsBuilder {
/// If true, injects the `Access-Control-Allow-Credentials` header in responses. /// If true, injects the `Access-Control-Allow-Credentials` header in responses.
/// This allows cookies and credentials to be submitted across domains. /// 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`. /// and `send_wildcards` set to `true`.
/// ///
/// Defaults to `false`. /// Defaults to `false`.

2
src/pipeline.rs
View File

@ -689,7 +689,7 @@ impl<S, H> Completed<S, H> {
#[inline] #[inline]
fn init(info: &mut PipelineInfo<S>) -> PipelineState<S, H> { fn init(info: &mut PipelineInfo<S>) -> PipelineState<S, H> {
if let Some(ref err) = info.error { 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() { if info.context.is_none() {

2
src/route.rs
View File

@ -127,7 +127,7 @@ impl<S: 'static> InnerHandler<S> {
#[inline] #[inline]
pub fn handle(&self, req: HttpRequest<S>) -> Reply { pub fn handle(&self, req: HttpRequest<S>) -> Reply {
// reason: handler is unique per thread, // 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)] #[allow(mutable_transmutes)]
#[cfg_attr(feature = "cargo-clippy", allow(borrowed_box))] #[cfg_attr(feature = "cargo-clippy", allow(borrowed_box))]
let h: &mut Box<RouteHandler<S>> = unsafe { mem::transmute(self.0.as_ref()) }; let h: &mut Box<RouteHandler<S>> = unsafe { mem::transmute(self.0.as_ref()) };

2
src/ws/client.rs
View File

@ -35,7 +35,7 @@ pub type WsClientFuture =
Future<Item=(WsClientReader, WsClientWriter), Error=WsClientError>; Future<Item=(WsClientReader, WsClientWriter), Error=WsClientError>;
/// Websockt client error /// Websocket client error
#[derive(Fail, Debug)] #[derive(Fail, Debug)]
pub enum WsClientError { pub enum WsClientError {
#[fail(display="Invalid url")] #[fail(display="Invalid url")]