1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-10-21 17:33:59 +00:00

Merge pull request #132 from andreevlex/spell-check-24-03

spelling check
This commit is contained in:
Alexander Andreev 2018-03-24 11:47:11 +03:00 committed by GitHub
commit 5127b85672
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 13 additions and 13 deletions

View file

@ -1,4 +1,4 @@
Copyright (c) 2017 Nikilay Kim
Copyright (c) 2017 Nikolay Kim
Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated

View file

@ -15,7 +15,7 @@ fn index(_req: HttpRequest) -> Box<Future<Item=HttpResponse, Error=Error>> {
.map_err(error::Error::from) // <- convert SendRequestError to an Error
.and_then(
|resp| resp.body() // <- this is MessageBody type, resolves to complete body
.from_err() // <- convet PayloadError to a Error
.from_err() // <- convert PayloadError to a Error
.and_then(|body| { // <- we got complete body, now send as server response
httpcodes::HttpOk.build()
.body(body)
@ -36,7 +36,7 @@ fn streaming(_req: HttpRequest) -> Box<Future<Item=HttpResponse, Error=Error>> {
// read one chunk from client response and send this chunk to a server response
// .from_err() converts PayloadError to a Error
.body(Body::Streaming(Box::new(resp.from_err())))
.map_err(|e| e.into()) // HttpOk::build() mayb return HttpError, we need to convert it to a Error
.map_err(|e| e.into()) // HttpOk::build() maybe return HttpError, we need to convert it to a Error
})
.responder()
}

View file

@ -17,7 +17,7 @@ struct AppState {
counter: Cell<usize>,
}
/// somple handle
/// simple handle
fn index(req: HttpRequest<AppState>) -> HttpResponse {
println!("{:?}", req);
req.state().counter.set(req.state().counter.get() + 1);

View file

@ -51,7 +51,7 @@ impl Handler<CreateUser> for DbExecutor {
name: &msg.name,
};
// normal diesl operations
// normal diesel operations
diesel::insert_into(users)
.values(&new_user)
.execute(&self.0)

View file

@ -103,8 +103,8 @@ pub enum ProtocolError {
/// A payload reached size limit.
#[fail(display="A payload reached size limit.")]
Overflow,
/// Continuation is not supproted
#[fail(display="Continuation is not supproted.")]
/// Continuation is not supported
#[fail(display="Continuation is not supported.")]
NoContinuation,
/// Bad utf-8 encoding
#[fail(display="Bad utf-8 encoding.")]