mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2025-02-02 12:22:20 +00:00
Code Issues Projects Releases Wiki Activity

chore: avoid single char error bindings

Browse source
This commit is contained in:
Rob Ede 2023-09-03 19:09:42 +01:00
parent d445742974
commit 215a52f565
No known key found for this signature in database
GPG key ID: 97C636207D3EF933
19 changed files with 73 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
actix-http/src/encoding/decoder.rs
View file

@ -191,7 +191,7 @@ impl ContentDecoder {
Ok(None) Ok(None)
} }
} }
Err(e) => Err(e), Err(err) => Err(err),
}, },
#[cfg(feature = "compress-gzip")] #[cfg(feature = "compress-gzip")]
@ -205,7 +205,7 @@ impl ContentDecoder {
Ok(None) Ok(None)
} }
} }
Err(e) => Err(e), Err(err) => Err(err),
}, },
#[cfg(feature = "compress-gzip")] #[cfg(feature = "compress-gzip")]
@ -218,7 +218,7 @@ impl ContentDecoder {
Ok(None) Ok(None)
} }
} }
Err(e) => Err(e), Err(err) => Err(err),
}, },
#[cfg(feature = "compress-zstd")] #[cfg(feature = "compress-zstd")]
@ -231,7 +231,7 @@ impl ContentDecoder {
Ok(None) Ok(None)
} }
} }
Err(e) => Err(e), Err(err) => Err(err),
}, },
} }
} }
@ -250,7 +250,7 @@ impl ContentDecoder {
Ok(None) Ok(None)
} }
} }
Err(e) => Err(e), Err(err) => Err(err),
}, },
#[cfg(feature = "compress-gzip")] #[cfg(feature = "compress-gzip")]
@ -265,7 +265,7 @@ impl ContentDecoder {
Ok(None) Ok(None)
} }
} }
Err(e) => Err(e), Err(err) => Err(err),
}, },
#[cfg(feature = "compress-gzip")] #[cfg(feature = "compress-gzip")]
@ -280,7 +280,7 @@ impl ContentDecoder {
Ok(None) Ok(None)
} }
} }
Err(e) => Err(e), Err(err) => Err(err),
}, },
#[cfg(feature = "compress-zstd")] #[cfg(feature = "compress-zstd")]
@ -295,7 +295,7 @@ impl ContentDecoder {
Ok(None) Ok(None)
} }
} }
Err(e) => Err(e), Err(err) => Err(err),
}, },
} }
} }

2
actix-http/src/h1/decoder.rs
View file

@ -532,7 +532,7 @@ impl Decoder for PayloadDecoder {
*state = match state.step(src, size, &mut buf) { *state = match state.step(src, size, &mut buf) {
Poll::Pending => return Ok(None), Poll::Pending => return Ok(None),
Poll::Ready(Ok(state)) => state, Poll::Ready(Ok(state)) => state,
Poll::Ready(Err(e)) => return Err(e), Poll::Ready(Err(err)) => return Err(err),
}; };
if *state == ChunkedState::End { if *state == ChunkedState::End {

6
actix-http/src/responses/builder.rs
View file

@ -93,7 +93,7 @@ impl ResponseBuilder {
Ok((key, value)) => { Ok((key, value)) => {
parts.headers.insert(key, value); parts.headers.insert(key, value);
} }
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
}; };
} }
@ -119,7 +119,7 @@ impl ResponseBuilder {
if let Some(parts) = self.inner() { if let Some(parts) = self.inner() {
match header.try_into_pair() { match header.try_into_pair() {
Ok((key, value)) => parts.headers.append(key, value), Ok((key, value)) => parts.headers.append(key, value),
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
}; };
} }
@ -193,7 +193,7 @@ impl ResponseBuilder {
Ok(value) => { Ok(value) => {
parts.headers.insert(header::CONTENT_TYPE, value); parts.headers.insert(header::CONTENT_TYPE, value);
} }
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
}; };
} }
self self

2
actix-http/src/ws/codec.rs
View file

@ -296,7 +296,7 @@ impl Decoder for Codec {
} }
} }
Ok(None) => Ok(None), Ok(None) => Ok(None),
Err(e) => Err(e), Err(err) => Err(err),
} }
} }
} }

2
actix-http/tests/test_server.rs
View file

@ -147,7 +147,7 @@ async fn chunked_payload() {
.take_payload() .take_payload()
.map(|res| match res { .map(|res| match res {
Ok(pl) => pl, Ok(pl) => pl,
Err(e) => panic!("Error reading payload: {}", e), Err(err) => panic!("Error reading payload: {err}"),
}) })
.fold(0usize, |acc, chunk| ready(acc + chunk.len())) .fold(0usize, |acc, chunk| ready(acc + chunk.len()))
.map(|req_size| { .map(|req_size| {

4
actix-web-actors/src/ws.rs
View file

@ -775,10 +775,10 @@ where
break; break;
} }
Poll::Pending => break, Poll::Pending => break,
Poll::Ready(Some(Err(e))) => { Poll::Ready(Some(Err(err))) => {
return Poll::Ready(Some(Err(ProtocolError::Io(io::Error::new( return Poll::Ready(Some(Err(ProtocolError::Io(io::Error::new(
io::ErrorKind::Other, io::ErrorKind::Other,
format!("{}", e), format!("{err}"),
))))); )))));
} }
} }

2
actix-web/Cargo.toml
View file

@ -1,11 +1,11 @@
[package] [package]
name = "actix-web" name = "actix-web"
version = "4.4.0" version = "4.4.0"
description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust"
authors = [ authors = [
"Nikolay Kim <fafhrd91@gmail.com>", "Nikolay Kim <fafhrd91@gmail.com>",
"Rob Ede <robjtede@icloud.com>", "Rob Ede <robjtede@icloud.com>",
] ]
description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust"
keywords = ["actix", "http", "web", "framework", "async"] keywords = ["actix", "http", "web", "framework", "async"]
categories = [ categories = [
"network-programming", "network-programming",

4
actix-web/src/app.rs
View file

@ -141,8 +141,8 @@ where
let fut = data(); let fut = data();
async move { async move {
match fut.await { match fut.await {
Err(e) => { Err(err) => {
log::error!("Can not construct data instance: {:?}", e); log::error!("Can not construct data instance: {err:?}");
Err(()) Err(())
} }
Ok(data) => { Ok(data) => {

10
actix-web/src/extract.rs
View file

@ -175,8 +175,8 @@ where
let res = ready!(this.fut.poll(cx)); let res = ready!(this.fut.poll(cx));
match res { match res {
Ok(t) => Poll::Ready(Ok(Some(t))), Ok(t) => Poll::Ready(Ok(Some(t))),
Err(e) => { Err(err) => {
log::debug!("Error for Option<T> extractor: {}", e.into()); log::debug!("Error for Option<T> extractor: {}", err.into());
Poll::Ready(Ok(None)) Poll::Ready(Ok(None))
} }
} }
@ -217,8 +217,8 @@ where
/// /// extract `Thing` from request /// /// extract `Thing` from request
/// async fn index(supplied_thing: Result<Thing>) -> String { /// async fn index(supplied_thing: Result<Thing>) -> String {
/// match supplied_thing { /// match supplied_thing {
/// Ok(thing) => format!("Got thing: {:?}", thing), /// Ok(thing) => format!("Got thing: {thing:?}"),
/// Err(e) => format!("Error extracting thing: {}", e) /// Err(err) => format!("Error extracting thing: {err}"),
/// } /// }
/// } /// }
/// ///
@ -355,7 +355,7 @@ mod tuple_from_req {
Poll::Ready(Ok(output)) => { Poll::Ready(Ok(output)) => {
let _ = this.$T.as_mut().project_replace(ExtractFuture::Done { output }); let _ = this.$T.as_mut().project_replace(ExtractFuture::Done { output });
}, },
Poll::Ready(Err(e)) => return Poll::Ready(Err(e.into())), Poll::Ready(Err(err)) => return Poll::Ready(Err(err.into())),
Poll::Pending => ready = false, Poll::Pending => ready = false,
}, },
ExtractProj::Done { .. } => {}, ExtractProj::Done { .. } => {},

2
actix-web/src/middleware/logger.rs
View file

@ -356,7 +356,7 @@ where
let res = match ready!(this.fut.poll(cx)) { let res = match ready!(this.fut.poll(cx)) {
Ok(res) => res, Ok(res) => res,
Err(e) => return Poll::Ready(Err(e)), Err(err) => return Poll::Ready(Err(err)),
}; };
if let Some(error) = res.response().error() { if let Some(error) = res.response().error() {

6
actix-web/src/response/builder.rs
View file

@ -64,7 +64,7 @@ impl HttpResponseBuilder {
Ok((key, value)) => { Ok((key, value)) => {
parts.headers.insert(key, value); parts.headers.insert(key, value);
} }
Err(e) => self.error = Some(e.into()), Err(err) => self.error = Some(err.into()),
}; };
} }
@ -86,7 +86,7 @@ impl HttpResponseBuilder {
if let Some(parts) = self.inner() { if let Some(parts) = self.inner() {
match header.try_into_pair() { match header.try_into_pair() {
Ok((key, value)) => parts.headers.append(key, value), Ok((key, value)) => parts.headers.append(key, value),
Err(e) => self.error = Some(e.into()), Err(err) => self.error = Some(err.into()),
}; };
} }
@ -210,7 +210,7 @@ impl HttpResponseBuilder {
Ok(value) => { Ok(value) => {
parts.headers.insert(header::CONTENT_TYPE, value); parts.headers.insert(header::CONTENT_TYPE, value);
} }
Err(e) => self.error = Some(e.into()), Err(err) => self.error = Some(err.into()),
}; };
} }
self self

2
actix-web/src/server.rs
View file

@ -853,7 +853,7 @@ fn bind_addrs(addrs: impl net::ToSocketAddrs, backlog: u32) -> io::Result<Vec<ne
success = true; success = true;
sockets.push(lst); sockets.push(lst);
} }
Err(e) => err = Some(e), Err(error) => err = Some(error),
} }
} }

6
actix-web/src/types/header.rs
View file

@ -2,7 +2,7 @@
use std::{fmt, ops}; use std::{fmt, ops};
use actix_utils::future::{err, ok, Ready}; use actix_utils::future::{ready, Ready};
use crate::{ use crate::{
dev::Payload, error::ParseError, extract::FromRequest, http::header::Header as ParseHeader, dev::Payload, error::ParseError, extract::FromRequest, http::header::Header as ParseHeader,
@ -66,8 +66,8 @@ where
#[inline] #[inline]
fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future { fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
match ParseHeader::parse(req) { match ParseHeader::parse(req) {
Ok(header) => ok(Header(header)), Ok(header) => ready(Ok(Header(header))),
Err(e) => err(e), Err(err) => ready(Err(err)),
} }
} }
} }

4
awc/src/client/connector.rs
View file

@ -909,8 +909,8 @@ mod resolver {
None => { None => {
let (cfg, opts) = match read_system_conf() { let (cfg, opts) = match read_system_conf() {
Ok((cfg, opts)) => (cfg, opts), Ok((cfg, opts)) => (cfg, opts),
Err(e) => { Err(err) => {
log::error!("TRust-DNS can not load system config: {}", e); log::error!("Trust-DNS can not load system config: {err}");
(ResolverConfig::default(), ResolverOpts::default()) (ResolverConfig::default(), ResolverOpts::default())
} }
}; };

2
awc/src/client/h1proto.rs
View file

@ -56,7 +56,7 @@ where
headers.insert(HOST, value); headers.insert(HOST, value);
} }
}, },
Err(e) => log::error!("Can not set HOST header {}", e), Err(err) => log::error!("Can not set HOST header {err}"),
} }
} }
} }

18
awc/src/client/h2proto.rs
View file

@ -106,9 +106,9 @@ where
} }
let res = poll_fn(|cx| io.poll_ready(cx)).await; let res = poll_fn(|cx| io.poll_ready(cx)).await;
if let Err(e) = res { if let Err(err) = res {
io.on_release(e.is_io()); io.on_release(err.is_io());
return Err(SendRequestError::from(e)); return Err(SendRequestError::from(err));
} }
let resp = match io.send_request(req, eof) { let resp = match io.send_request(req, eof) {
@ -120,9 +120,9 @@ where
} }
fut.await.map_err(SendRequestError::from)? fut.await.map_err(SendRequestError::from)?
} }
Err(e) => { Err(err) => {
io.on_release(e.is_io()); io.on_release(err.is_io());
return Err(e.into()); return Err(err.into());
} }
}; };
@ -169,8 +169,8 @@ where
let len = b.len(); let len = b.len();
let bytes = b.split_to(std::cmp::min(cap, len)); let bytes = b.split_to(std::cmp::min(cap, len));
if let Err(e) = send.send_data(bytes, false) { if let Err(err) = send.send_data(bytes, false) {
return Err(e.into()); return Err(err.into());
} }
if !b.is_empty() { if !b.is_empty() {
send.reserve_capacity(b.len()); send.reserve_capacity(b.len());
@ -179,7 +179,7 @@ where
} }
continue; continue;
} }
Some(Err(e)) => return Err(e.into()), Some(Err(err)) => return Err(err.into()),
} }
} }
} }

24
awc/src/request.rs
View file

@ -83,7 +83,7 @@ impl ClientRequest {
{ {
match Uri::try_from(uri) { match Uri::try_from(uri) {
Ok(uri) => self.head.uri = uri, Ok(uri) => self.head.uri = uri,
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
} }
self self
} }
@ -152,7 +152,7 @@ impl ClientRequest {
Ok((key, value)) => { Ok((key, value)) => {
self.head.headers.insert(key, value); self.head.headers.insert(key, value);
} }
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
}; };
self self
@ -166,7 +166,7 @@ impl ClientRequest {
self.head.headers.insert(key, value); self.head.headers.insert(key, value);
} }
} }
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
}; };
self self
@ -185,7 +185,7 @@ impl ClientRequest {
pub fn append_header(mut self, header: impl TryIntoHeaderPair) -> Self { pub fn append_header(mut self, header: impl TryIntoHeaderPair) -> Self {
match header.try_into_pair() { match header.try_into_pair() {
Ok((key, value)) => self.head.headers.append(key, value), Ok((key, value)) => self.head.headers.append(key, value),
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
}; };
self self
@ -217,7 +217,7 @@ impl ClientRequest {
Ok(value) => { Ok(value) => {
self.head.headers.insert(header::CONTENT_TYPE, value); self.head.headers.insert(header::CONTENT_TYPE, value);
} }
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
} }
self self
} }
@ -299,7 +299,7 @@ impl ClientRequest {
match Uri::from_parts(parts) { match Uri::from_parts(parts) {
Ok(uri) => self.head.uri = uri, Ok(uri) => self.head.uri = uri,
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
} }
} }
@ -311,7 +311,7 @@ impl ClientRequest {
pub fn freeze(self) -> Result<FrozenClientRequest, FreezeRequestError> { pub fn freeze(self) -> Result<FrozenClientRequest, FreezeRequestError> {
let slf = match self.prep_for_sending() { let slf = match self.prep_for_sending() {
Ok(slf) => slf, Ok(slf) => slf,
Err(e) => return Err(e.into()), Err(err) => return Err(err.into()),
}; };
let request = FrozenClientRequest { let request = FrozenClientRequest {
@ -332,7 +332,7 @@ impl ClientRequest {
{ {
let slf = match self.prep_for_sending() { let slf = match self.prep_for_sending() {
Ok(slf) => slf, Ok(slf) => slf,
Err(e) => return e.into(), Err(err) => return err.into(),
}; };
RequestSender::Owned(slf.head).send_body( RequestSender::Owned(slf.head).send_body(
@ -348,7 +348,7 @@ impl ClientRequest {
pub fn send_json<T: Serialize>(self, value: &T) -> SendClientRequest { pub fn send_json<T: Serialize>(self, value: &T) -> SendClientRequest {
let slf = match self.prep_for_sending() { let slf = match self.prep_for_sending() {
Ok(slf) => slf, Ok(slf) => slf,
Err(e) => return e.into(), Err(err) => return err.into(),
}; };
RequestSender::Owned(slf.head).send_json( RequestSender::Owned(slf.head).send_json(
@ -366,7 +366,7 @@ impl ClientRequest {
pub fn send_form<T: Serialize>(self, value: &T) -> SendClientRequest { pub fn send_form<T: Serialize>(self, value: &T) -> SendClientRequest {
let slf = match self.prep_for_sending() { let slf = match self.prep_for_sending() {
Ok(slf) => slf, Ok(slf) => slf,
Err(e) => return e.into(), Err(err) => return err.into(),
}; };
RequestSender::Owned(slf.head).send_form( RequestSender::Owned(slf.head).send_form(
@ -386,7 +386,7 @@ impl ClientRequest {
{ {
let slf = match self.prep_for_sending() { let slf = match self.prep_for_sending() {
Ok(slf) => slf, Ok(slf) => slf,
Err(e) => return e.into(), Err(err) => return err.into(),
}; };
RequestSender::Owned(slf.head).send_stream( RequestSender::Owned(slf.head).send_stream(
@ -402,7 +402,7 @@ impl ClientRequest {
pub fn send(self) -> SendClientRequest { pub fn send(self) -> SendClientRequest {
let slf = match self.prep_for_sending() { let slf = match self.prep_for_sending() {
Ok(slf) => slf, Ok(slf) => slf,
Err(e) => return e.into(), Err(err) => return err.into(),
}; };
RequestSender::Owned(slf.head).send( RequestSender::Owned(slf.head).send(

16
awc/src/sender.rs
View file

@ -122,8 +122,8 @@ impl Future for SendClientRequest {
Poll::Ready(res) Poll::Ready(res)
} }
SendClientRequest::Err(ref mut e) => match e.take() { SendClientRequest::Err(ref mut err) => match err.take() {
Some(e) => Poll::Ready(Err(e)), Some(err) => Poll::Ready(Err(err)),
None => panic!("Attempting to call completed future"), None => panic!("Attempting to call completed future"),
}, },
} }
@ -147,8 +147,8 @@ impl Future for SendClientRequest {
.poll(cx) .poll(cx)
.map_ok(|res| res.into_client_response()._timeout(delay.take())) .map_ok(|res| res.into_client_response()._timeout(delay.take()))
} }
SendClientRequest::Err(ref mut e) => match e.take() { SendClientRequest::Err(ref mut err) => match err.take() {
Some(e) => Poll::Ready(Err(e)), Some(err) => Poll::Ready(Err(err)),
None => panic!("Attempting to call completed future"), None => panic!("Attempting to call completed future"),
}, },
} }
@ -219,8 +219,8 @@ impl RequestSender {
Err(err) => return PrepForSendingError::Json(err).into(), Err(err) => return PrepForSendingError::Json(err).into(),
}; };
if let Err(e) = self.set_header_if_none(header::CONTENT_TYPE, "application/json") { if let Err(err) = self.set_header_if_none(header::CONTENT_TYPE, "application/json") {
return e.into(); return err.into();
} }
self.send_body(addr, response_decompress, timeout, config, body) self.send_body(addr, response_decompress, timeout, config, body)
@ -291,7 +291,7 @@ impl RequestSender {
Ok(value) => { Ok(value) => {
head.headers.insert(key, value); head.headers.insert(key, value);
} }
Err(e) => return Err(e.into()), Err(err) => return Err(err.into()),
} }
} }
} }
@ -304,7 +304,7 @@ impl RequestSender {
let h = extra_headers.get_or_insert(HeaderMap::new()); let h = extra_headers.get_or_insert(HeaderMap::new());
h.insert(key, v) h.insert(key, v)
} }
Err(e) => return Err(e.into()), Err(err) => return Err(err.into()),
}; };
} }
} }

18
awc/src/ws.rs
View file

@ -64,7 +64,7 @@ pub struct WebsocketsRequest {
} }
impl WebsocketsRequest { impl WebsocketsRequest {
/// Create new WebSocket connection /// Create new WebSocket connection.
pub(crate) fn new<U>(uri: U, config: ClientConfig) -> Self pub(crate) fn new<U>(uri: U, config: ClientConfig) -> Self
where where
Uri: TryFrom<U>, Uri: TryFrom<U>,
@ -82,7 +82,7 @@ impl WebsocketsRequest {
match Uri::try_from(uri) { match Uri::try_from(uri) {
Ok(uri) => head.uri = uri, Ok(uri) => head.uri = uri,
Err(e) => err = Some(e.into()), Err(error) => err = Some(error.into()),
} }
WebsocketsRequest { WebsocketsRequest {
@ -143,7 +143,7 @@ impl WebsocketsRequest {
{ {
match HeaderValue::try_from(origin) { match HeaderValue::try_from(origin) {
Ok(value) => self.origin = Some(value), Ok(value) => self.origin = Some(value),
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
} }
self self
} }
@ -177,9 +177,9 @@ impl WebsocketsRequest {
Ok(value) => { Ok(value) => {
self.head.headers.append(key, value); self.head.headers.append(key, value);
} }
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
}, },
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
} }
self self
} }
@ -196,9 +196,9 @@ impl WebsocketsRequest {
Ok(value) => { Ok(value) => {
self.head.headers.insert(key, value); self.head.headers.insert(key, value);
} }
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
}, },
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
} }
self self
} }
@ -217,11 +217,11 @@ impl WebsocketsRequest {
Ok(value) => { Ok(value) => {
self.head.headers.insert(key, value); self.head.headers.insert(key, value);
} }
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
} }
} }
} }
Err(e) => self.err = Some(e.into()), Err(err) => self.err = Some(err.into()),
} }
self self
} }