diff options
Diffstat (limited to 'src/api/k2v')
-rw-r--r-- | src/api/k2v/api_server.rs | 2 | ||||
-rw-r--r-- | src/api/k2v/batch.rs | 2 | ||||
-rw-r--r-- | src/api/k2v/index.rs | 2 | ||||
-rw-r--r-- | src/api/k2v/item.rs | 2 | ||||
-rw-r--r-- | src/api/k2v/range.rs | 2 | ||||
-rw-r--r-- | src/api/k2v/router.rs | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/api/k2v/api_server.rs b/src/api/k2v/api_server.rs index b14bcda6..9b4ad882 100644 --- a/src/api/k2v/api_server.rs +++ b/src/api/k2v/api_server.rs @@ -12,7 +12,7 @@ use garage_util::error::Error as GarageError; use garage_model::garage::Garage; -use crate::error::*; +use crate::s3::error::*; use crate::generic_server::*; use crate::signature::payload::check_payload_signature; diff --git a/src/api/k2v/batch.rs b/src/api/k2v/batch.rs index 26d3cef0..dab3bfb2 100644 --- a/src/api/k2v/batch.rs +++ b/src/api/k2v/batch.rs @@ -12,7 +12,7 @@ use garage_model::garage::Garage; use garage_model::k2v::causality::*; use garage_model::k2v::item_table::*; -use crate::error::*; +use crate::s3::error::*; use crate::helpers::*; use crate::k2v::range::read_range; diff --git a/src/api/k2v/index.rs b/src/api/k2v/index.rs index 896dbcf0..e587841c 100644 --- a/src/api/k2v/index.rs +++ b/src/api/k2v/index.rs @@ -12,7 +12,7 @@ use garage_table::util::*; use garage_model::garage::Garage; use garage_model::k2v::counter_table::{BYTES, CONFLICTS, ENTRIES, VALUES}; -use crate::error::*; +use crate::s3::error::*; use crate::k2v::range::read_range; pub async fn handle_read_index( diff --git a/src/api/k2v/item.rs b/src/api/k2v/item.rs index 1860863e..95624d57 100644 --- a/src/api/k2v/item.rs +++ b/src/api/k2v/item.rs @@ -10,7 +10,7 @@ use garage_model::garage::Garage; use garage_model::k2v::causality::*; use garage_model::k2v::item_table::*; -use crate::error::*; +use crate::s3::error::*; pub const X_GARAGE_CAUSALITY_TOKEN: &str = "X-Garage-Causality-Token"; diff --git a/src/api/k2v/range.rs b/src/api/k2v/range.rs index 8d4cefbc..cf6034b9 100644 --- a/src/api/k2v/range.rs +++ b/src/api/k2v/range.rs @@ -7,7 +7,7 @@ use std::sync::Arc; use garage_table::replication::TableShardedReplication; use garage_table::*; -use crate::error::*; +use crate::s3::error::*; use crate::helpers::key_after_prefix; /// Read range in a Garage table. diff --git a/src/api/k2v/router.rs b/src/api/k2v/router.rs index 611b6629..c509a4da 100644 --- a/src/api/k2v/router.rs +++ b/src/api/k2v/router.rs @@ -1,4 +1,4 @@ -use crate::error::*; +use crate::s3::error::*; use std::borrow::Cow; |