This commit is contained in:
trinity-1686a
2025-11-01 18:04:54 +01:00
parent 82297371bf
commit ac851d6dee
8 changed files with 11 additions and 11 deletions
+1 -1
View File
@@ -1,8 +1,8 @@
use std::convert::TryFrom;
use thiserror::Error;
use hyper::header::HeaderValue;
use hyper::{HeaderMap, StatusCode};
use thiserror::Error;
pub use garage_model::helper::error::Error as HelperError;
+1 -1
View File
@@ -1,7 +1,7 @@
use std::convert::TryFrom;
use thiserror::Error;
use hyper::StatusCode;
use thiserror::Error;
use garage_util::error::Error as GarageError;
+1 -1
View File
@@ -1,6 +1,6 @@
use thiserror::Error;
use hyper::header::HeaderValue;
use hyper::{HeaderMap, StatusCode};
use thiserror::Error;
use garage_api_common::common_error::{commonErrorDerivative, CommonError};
pub(crate) use garage_api_common::common_error::{helper_error_as_internal, pass_helper_error};
+4 -4
View File
@@ -1,8 +1,8 @@
use std::convert::TryInto;
use thiserror::Error;
use hyper::header::HeaderValue;
use hyper::{HeaderMap, StatusCode};
use thiserror::Error;
use garage_model::helper::error::Error as HelperError;
@@ -100,9 +100,9 @@ impl From<HelperError> for Error {
}
impl From<(http_range::HttpRangeParseError, u64)> for Error {
fn from (err: (http_range::HttpRangeParseError, u64)) -> Error {
Error::InvalidRange(err)
}
fn from(err: (http_range::HttpRangeParseError, u64)) -> Error {
Error::InvalidRange(err)
}
}
impl From<roxmltree::Error> for Error {
+1 -1
View File
@@ -1,5 +1,5 @@
use thiserror::Error;
use serde::{Deserialize, Serialize};
use thiserror::Error;
use garage_util::error::Error as GarageError;
+1 -1
View File
@@ -1,7 +1,7 @@
use std::io;
use thiserror::Error;
use log::error;
use thiserror::Error;
#[derive(Debug, Error)]
pub enum Error {
+1 -1
View File
@@ -3,8 +3,8 @@ use std::fs::File;
use std::io::Read;
use std::net::{IpAddr, SocketAddr};
use thiserror::Error;
use serde::{Deserialize, Serialize};
use thiserror::Error;
use garage_net::NodeID;
+1 -1
View File
@@ -1,6 +1,6 @@
use thiserror::Error;
use hyper::header::HeaderValue;
use hyper::{HeaderMap, StatusCode};
use thiserror::Error;
use garage_api_common::generic_server::ApiError;