mirrors/garage
1
0
Fork 0
mirror of https://git.deuxfleurs.fr/Deuxfleurs/garage.git synced 2024-11-25 09:31:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[dep-upgrade-202402] slightly more explicit error management

Browse source
This commit is contained in:
Alex Auvolat 2024-02-07 14:53:13 +01:00
parent a31d1bd496
commit 53746b59e5
No known key found for this signature in database
GPG key ID: 0E496D15096376BE
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/api/generic_server.rs
View file

@ -1,3 +1,4 @@
use std::convert::Infallible;
use std::fs::{self, Permissions}; use std::fs::{self, Permissions};
use std::os::unix::fs::PermissionsExt; use std::os::unix::fs::PermissionsExt;
use std::sync::Arc; use std::sync::Arc;
@ -194,7 +195,8 @@ impl<A: ApiHandler> ApiServer<A> {
} else { } else {
info!("Response: error {}, {}", e.http_status_code(), e); info!("Response: error {}, {}", e.http_status_code(), e);
} }
Ok(http_error.map(|body| BoxBody::new(body.map_err(|_| unreachable!())))) Ok(http_error
.map(|body| BoxBody::new(body.map_err(|_: Infallible| unreachable!()))))
} }
} }
} }

6
src/api/helpers.rs
View file

@ -1,3 +1,5 @@
use std::convert::Infallible;
use http_body_util::{BodyExt, Full as FullBody}; use http_body_util::{BodyExt, Full as FullBody};
use hyper::{body::Body, Request, Response}; use hyper::{body::Body, Request, Response};
use idna::domain_to_unicode; use idna::domain_to_unicode;
@ -151,10 +153,10 @@ pub fn string_body<E>(s: String) -> BoxBody<E> {
bytes_body(bytes::Bytes::from(s.into_bytes())) bytes_body(bytes::Bytes::from(s.into_bytes()))
} }
pub fn bytes_body<E>(b: bytes::Bytes) -> BoxBody<E> { pub fn bytes_body<E>(b: bytes::Bytes) -> BoxBody<E> {
BoxBody::new(FullBody::new(b).map_err(|_| unreachable!())) BoxBody::new(FullBody::new(b).map_err(|_: Infallible| unreachable!()))
} }
pub fn empty_body<E>() -> BoxBody<E> { pub fn empty_body<E>() -> BoxBody<E> {
BoxBody::new(http_body_util::Empty::new().map_err(|_| unreachable!())) BoxBody::new(http_body_util::Empty::new().map_err(|_: Infallible| unreachable!()))
} }
pub fn error_body(s: String) -> ErrorBody { pub fn error_body(s: String) -> ErrorBody {
ErrorBody::from(bytes::Bytes::from(s.into_bytes())) ErrorBody::from(bytes::Bytes::from(s.into_bytes()))