mirror of
https://github.com/fafhrd91/actix-web
synced 2025-06-27 07:19:04 +02:00
chore: avoid single char error bindings
This commit is contained in:
@ -1,11 +1,11 @@
|
||||
[package]
|
||||
name = "actix-web"
|
||||
version = "4.4.0"
|
||||
description = "Actix Web is a powerful, pragmatic, and extremely fast web framework for Rust"
|
||||
authors = [
|
||||
"Nikolay Kim <fafhrd91@gmail.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"]
|
||||
categories = [
|
||||
"network-programming",
|
||||
|
@ -141,8 +141,8 @@ where
|
||||
let fut = data();
|
||||
async move {
|
||||
match fut.await {
|
||||
Err(e) => {
|
||||
log::error!("Can not construct data instance: {:?}", e);
|
||||
Err(err) => {
|
||||
log::error!("Can not construct data instance: {err:?}");
|
||||
Err(())
|
||||
}
|
||||
Ok(data) => {
|
||||
|
@ -175,8 +175,8 @@ where
|
||||
let res = ready!(this.fut.poll(cx));
|
||||
match res {
|
||||
Ok(t) => Poll::Ready(Ok(Some(t))),
|
||||
Err(e) => {
|
||||
log::debug!("Error for Option<T> extractor: {}", e.into());
|
||||
Err(err) => {
|
||||
log::debug!("Error for Option<T> extractor: {}", err.into());
|
||||
Poll::Ready(Ok(None))
|
||||
}
|
||||
}
|
||||
@ -217,8 +217,8 @@ where
|
||||
/// /// extract `Thing` from request
|
||||
/// async fn index(supplied_thing: Result<Thing>) -> String {
|
||||
/// match supplied_thing {
|
||||
/// Ok(thing) => format!("Got thing: {:?}", thing),
|
||||
/// Err(e) => format!("Error extracting thing: {}", e)
|
||||
/// Ok(thing) => format!("Got thing: {thing:?}"),
|
||||
/// Err(err) => format!("Error extracting thing: {err}"),
|
||||
/// }
|
||||
/// }
|
||||
///
|
||||
@ -355,7 +355,7 @@ mod tuple_from_req {
|
||||
Poll::Ready(Ok(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,
|
||||
},
|
||||
ExtractProj::Done { .. } => {},
|
||||
|
@ -356,7 +356,7 @@ where
|
||||
|
||||
let res = match ready!(this.fut.poll(cx)) {
|
||||
Ok(res) => res,
|
||||
Err(e) => return Poll::Ready(Err(e)),
|
||||
Err(err) => return Poll::Ready(Err(err)),
|
||||
};
|
||||
|
||||
if let Some(error) = res.response().error() {
|
||||
|
@ -64,7 +64,7 @@ impl HttpResponseBuilder {
|
||||
Ok((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() {
|
||||
match header.try_into_pair() {
|
||||
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) => {
|
||||
parts.headers.insert(header::CONTENT_TYPE, value);
|
||||
}
|
||||
Err(e) => self.error = Some(e.into()),
|
||||
Err(err) => self.error = Some(err.into()),
|
||||
};
|
||||
}
|
||||
self
|
||||
|
@ -853,7 +853,7 @@ fn bind_addrs(addrs: impl net::ToSocketAddrs, backlog: u32) -> io::Result<Vec<ne
|
||||
success = true;
|
||||
sockets.push(lst);
|
||||
}
|
||||
Err(e) => err = Some(e),
|
||||
Err(error) => err = Some(error),
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
use std::{fmt, ops};
|
||||
|
||||
use actix_utils::future::{err, ok, Ready};
|
||||
use actix_utils::future::{ready, Ready};
|
||||
|
||||
use crate::{
|
||||
dev::Payload, error::ParseError, extract::FromRequest, http::header::Header as ParseHeader,
|
||||
@ -66,8 +66,8 @@ where
|
||||
#[inline]
|
||||
fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
|
||||
match ParseHeader::parse(req) {
|
||||
Ok(header) => ok(Header(header)),
|
||||
Err(e) => err(e),
|
||||
Ok(header) => ready(Ok(Header(header))),
|
||||
Err(err) => ready(Err(err)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user