From 3aa008eea88bd91dddf48531e5d035a6c58e9f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20K=C4=99pka?= <wojtek.kepka@protonmail.com>
Date: Wed, 7 Apr 2021 14:12:50 +0200
Subject: Rename `IPAM` to `Ipam`

---
 src/lib.rs     | 2 +-
 src/network.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/lib.rs b/src/lib.rs
index 67b830e..14c8559 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -122,7 +122,7 @@ reexport! {
         SearchResult, ImageInfo as Image, ImageDetails, Config, History, Status,
     };
     network::{
-        NetworkSettings, NetworkEntry, NetworkInfo as Network, IPAM, NetworkDetails,
+        NetworkSettings, NetworkEntry, NetworkInfo as Network, Ipam, NetworkDetails,
         NetworkContainerDetails, NetworkCreateInfo,
     };
     service::{
diff --git a/src/network.rs b/src/network.rs
index e274d2d..6b68c71 100644
--- a/src/network.rs
+++ b/src/network.rs
@@ -351,7 +351,7 @@ pub struct NetworkInfo {
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "PascalCase")]
-pub struct IPAM {
+pub struct Ipam {
     pub driver: String,
     pub config: Vec<HashMap<String, String>>,
     pub options: Option<HashMap<String, String>>,
@@ -367,7 +367,7 @@ pub struct NetworkDetails {
     #[serde(rename = "EnableIPv6")]
     pub enable_ipv6: bool,
     #[serde(rename = "IPAM")]
-    pub ipam: IPAM,
+    pub ipam: Ipam,
     pub internal: bool,
     pub attachable: bool,
     pub containers: HashMap<String, NetworkContainerDetails>,
-- 
cgit v1.2.3


From 513fe3ce2959e75d3591975ffaae826bf2ab0af0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20K=C4=99pka?= <wojtek.kepka@protonmail.com>
Date: Wed, 7 Apr 2021 14:13:09 +0200
Subject: Allow uppercase acronyms for Error::IO

---
 src/errors.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/errors.rs b/src/errors.rs
index a182ff6..a02836a 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -14,10 +14,14 @@ pub enum Error {
     SerdeJsonError(SerdeError),
     Hyper(hyper::Error),
     Http(hyper::http::Error),
+    #[allow(clippy::upper_case_acronyms)]
     IO(IoError),
     Encoding(FromUtf8Error),
     InvalidResponse(String),
-    Fault { code: StatusCode, message: String },
+    Fault {
+        code: StatusCode,
+        message: String,
+    },
     ConnectionNotUpgraded,
 }
 
-- 
cgit v1.2.3