Rename error::Error to s3::error::Error

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;

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;
 

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(

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";
 

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.

src/api/k2v/router.rs

@@ -1,4 +1,4 @@
-use crate::error::*;
+use crate::s3::error::*;
 
 use std::borrow::Cow;