diff --git a/src/api/admin/error.rs b/src/api/admin/error.rs
index 97f02156..17d4c200 100644
--- a/src/api/admin/error.rs
+++ b/src/api/admin/error.rs
@@ -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;
 
diff --git a/src/api/common/common_error.rs b/src/api/common/common_error.rs
index 1335fece..e596a6e9 100644
--- a/src/api/common/common_error.rs
+++ b/src/api/common/common_error.rs
@@ -1,7 +1,7 @@
 use std::convert::TryFrom;
 
-use thiserror::Error;
 use hyper::StatusCode;
+use thiserror::Error;
 
 use garage_util::error::Error as GarageError;
 
diff --git a/src/api/k2v/error.rs b/src/api/k2v/error.rs
index c860ab98..f1937fe5 100644
--- a/src/api/k2v/error.rs
+++ b/src/api/k2v/error.rs
@@ -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};
diff --git a/src/api/s3/error.rs b/src/api/s3/error.rs
index 6f4dfb5c..64112084 100644
--- a/src/api/s3/error.rs
+++ b/src/api/s3/error.rs
@@ -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 {
diff --git a/src/model/helper/error.rs b/src/model/helper/error.rs
index 6a78546d..bc483c7d 100644
--- a/src/model/helper/error.rs
+++ b/src/model/helper/error.rs
@@ -1,5 +1,5 @@
-use thiserror::Error;
 use serde::{Deserialize, Serialize};
+use thiserror::Error;
 
 use garage_util::error::Error as GarageError;
 
diff --git a/src/net/error.rs b/src/net/error.rs
index 899fe21c..f67794ed 100644
--- a/src/net/error.rs
+++ b/src/net/error.rs
@@ -1,7 +1,7 @@
 use std::io;
 
-use thiserror::Error;
 use log::error;
+use thiserror::Error;
 
 #[derive(Debug, Error)]
 pub enum Error {
diff --git a/src/rpc/consul.rs b/src/rpc/consul.rs
index 801e937f..760e9fcb 100644
--- a/src/rpc/consul.rs
+++ b/src/rpc/consul.rs
@@ -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;
 
diff --git a/src/web/error.rs b/src/web/error.rs
index 49650b1d..aef74923 100644
--- a/src/web/error.rs
+++ b/src/web/error.rs
@@ -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;