From ef25041ccec34183fb4086ed07c7c3e9eda6a1a5 Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Thu, 2 Dec 2021 10:53:28 +0100
Subject: [PATCH] Use inline modules for intermediate layer

(Skip `connection` since it is dissolved in #29.)
---
 epp-client/src/contact.rs |  7 -------
 epp-client/src/domain.rs  | 10 ----------
 epp-client/src/host.rs    |  7 -------
 epp-client/src/lib.rs     | 42 +++++++++++++++++++++++++++++++++++----
 epp-client/src/message.rs |  2 --
 5 files changed, 38 insertions(+), 30 deletions(-)
 delete mode 100644 epp-client/src/contact.rs
 delete mode 100644 epp-client/src/domain.rs
 delete mode 100644 epp-client/src/host.rs
 delete mode 100644 epp-client/src/message.rs

diff --git a/epp-client/src/contact.rs b/epp-client/src/contact.rs
deleted file mode 100644
index f00d130..0000000
--- a/epp-client/src/contact.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub mod check;
-pub mod create;
-pub mod delete;
-pub mod info;
-pub mod update;
-
-pub const EPP_CONTACT_XMLNS: &str = "urn:ietf:params:xml:ns:contact-1.0";
diff --git a/epp-client/src/domain.rs b/epp-client/src/domain.rs
deleted file mode 100644
index 8c259a5..0000000
--- a/epp-client/src/domain.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-pub mod check;
-pub mod create;
-pub mod delete;
-pub mod info;
-pub mod renew;
-pub mod rgp;
-pub mod transfer;
-pub mod update;
-
-pub const EPP_DOMAIN_XMLNS: &str = "urn:ietf:params:xml:ns:domain-1.0";
diff --git a/epp-client/src/host.rs b/epp-client/src/host.rs
deleted file mode 100644
index 75a6cab..0000000
--- a/epp-client/src/host.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-pub mod check;
-pub mod create;
-pub mod delete;
-pub mod info;
-pub mod update;
-
-pub const EPP_HOST_XMLNS: &str = "urn:ietf:params:xml:ns:host-1.0";
diff --git a/epp-client/src/lib.rs b/epp-client/src/lib.rs
index 1927a8d..11c9704 100644
--- a/epp-client/src/lib.rs
+++ b/epp-client/src/lib.rs
@@ -103,19 +103,53 @@ extern crate log;
 pub mod client;
 pub mod common;
 pub mod config;
-pub mod contact;
-pub mod domain;
 pub mod error;
 pub mod hello;
-pub mod host;
 pub mod login;
 pub mod logout;
-pub mod message;
 pub mod registry;
 pub mod request;
 pub mod response;
 pub mod xml;
 
+pub mod contact {
+    pub mod check;
+    pub mod create;
+    pub mod delete;
+    pub mod info;
+    pub mod update;
+
+    pub const EPP_CONTACT_XMLNS: &str = "urn:ietf:params:xml:ns:contact-1.0";
+}
+
+pub mod domain {
+    pub mod check;
+    pub mod create;
+    pub mod delete;
+    pub mod info;
+    pub mod renew;
+    pub mod rgp;
+    pub mod transfer;
+    pub mod update;
+
+    pub const EPP_DOMAIN_XMLNS: &str = "urn:ietf:params:xml:ns:domain-1.0";
+}
+
+pub mod host {
+    pub mod check;
+    pub mod create;
+    pub mod delete;
+    pub mod info;
+    pub mod update;
+
+    pub const EPP_HOST_XMLNS: &str = "urn:ietf:params:xml:ns:host-1.0";
+}
+
+pub mod message {
+    pub mod ack;
+    pub mod poll;
+}
+
 pub use client::default_client_tr_id_fn as generate_client_tr_id;
 pub use client::EppClient;
 
diff --git a/epp-client/src/message.rs b/epp-client/src/message.rs
deleted file mode 100644
index 60b48c9..0000000
--- a/epp-client/src/message.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod ack;
-pub mod poll;