renaming the request.rs file so it is not confusing

icann · Jan 4, 2025 · 3b0256c · 3b0256c
1 parent f6d1737
commit 3b0256c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/icann-rdap-cli/src/bin/rdap/query.rs b/icann-rdap-cli/src/bin/rdap/query.rs
@@ -12,7 +12,7 @@ use icann_rdap_client::{
     gtld::{GtldParams, ToGtldWhois},
     md::{redacted::replace_redacted_items, MdOptions, MdParams, ToMd},
     query::{qtype::QueryType, request::ResponseData},
-    request::{RequestData, RequestResponse, RequestResponses, SourceType},
+    rr::{RequestData, RequestResponse, RequestResponses, SourceType},
 };
 use reqwest::Client;
 use termimad::{crossterm::style::Color::*, Alignment, MadSkin};

diff --git a/icann-rdap-cli/tests/integration/cache.rs b/icann-rdap-cli/tests/integration/cache.rs
@@ -1,6 +1,6 @@
 #![allow(non_snake_case)]
 
-use icann_rdap_client::request::RequestResponseOwned;
+use icann_rdap_client::rr::RequestResponseOwned;
 use icann_rdap_common::response::{domain::Domain, entity::Entity, RdapResponse};
 use icann_rdap_srv::storage::StoreOps;
 

diff --git a/icann-rdap-cli/tests/integration/source.rs b/icann-rdap-cli/tests/integration/source.rs
@@ -1,6 +1,6 @@
 #![allow(non_snake_case)]
 
-use icann_rdap_client::request::{RequestResponseOwned, SourceType};
+use icann_rdap_client::rr::{RequestResponseOwned, SourceType};
 use icann_rdap_common::response::network::Network;
 use icann_rdap_srv::storage::StoreOps;
 use rstest::rstest;

diff --git a/icann-rdap-client/src/lib.rs b/icann-rdap-client/src/lib.rs
@@ -16,7 +16,7 @@ pub mod iana_request;
 pub mod md;
 pub mod query;
 pub mod registered_redactions;
-pub mod request;
+pub mod rr;
 
 #[doc(inline)]
 pub use crate::client::create_client;

diff --git a/icann-rdap-client/src/md/mod.rs b/icann-rdap-client/src/md/mod.rs
@@ -1,6 +1,6 @@
 //! Converts RDAP to Markdown.
 
-use crate::request::RequestData;
+use crate::rr::RequestData;
 use buildstructor::Builder;
 use icann_rdap_common::{check::CheckParams, httpdata::HttpData, response::RdapResponse};
 use std::{any::TypeId, char};

diff --git a/icann-rdap-client/src/md/table.rs b/icann-rdap-client/src/md/table.rs
@@ -249,7 +249,10 @@ mod tests {
         response::{types::Common, RdapResponse},
     };
 
-    use crate::{md::ToMd, request::RequestData};
+    use crate::{
+        md::ToMd,
+        rr::{RequestData, SourceType},
+    };
 
     use super::MultiPartTable;
 
@@ -262,7 +265,7 @@ mod tests {
         let req_data = RequestData {
             req_number: 0,
             source_host: "",
-            source_type: crate::request::SourceType::UncategorizedRegistry,
+            source_type: SourceType::UncategorizedRegistry,
         };
         let rdap_response = RdapResponse::ErrorResponse(
             icann_rdap_common::response::error::Error::builder()
@@ -294,7 +297,7 @@ mod tests {
         let req_data = RequestData {
             req_number: 0,
             source_host: "",
-            source_type: crate::request::SourceType::UncategorizedRegistry,
+            source_type: SourceType::UncategorizedRegistry,
         };
         let rdap_response = RdapResponse::ErrorResponse(
             icann_rdap_common::response::error::Error::builder()
@@ -327,7 +330,7 @@ mod tests {
         let req_data = RequestData {
             req_number: 0,
             source_host: "",
-            source_type: crate::request::SourceType::UncategorizedRegistry,
+            source_type: SourceType::UncategorizedRegistry,
         };
         let rdap_response = RdapResponse::ErrorResponse(
             icann_rdap_common::response::error::Error::builder()
@@ -362,7 +365,7 @@ mod tests {
         let req_data = RequestData {
             req_number: 0,
             source_host: "",
-            source_type: crate::request::SourceType::UncategorizedRegistry,
+            source_type: SourceType::UncategorizedRegistry,
         };
         let rdap_response = RdapResponse::ErrorResponse(
             icann_rdap_common::response::error::Error::builder()
@@ -395,7 +398,7 @@ mod tests {
         let req_data = RequestData {
             req_number: 0,
             source_host: "",
-            source_type: crate::request::SourceType::UncategorizedRegistry,
+            source_type: SourceType::UncategorizedRegistry,
         };
         let rdap_response = RdapResponse::ErrorResponse(
             icann_rdap_common::response::error::Error::builder()
@@ -434,7 +437,7 @@ mod tests {
         let req_data = RequestData {
             req_number: 0,
             source_host: "",
-            source_type: crate::request::SourceType::UncategorizedRegistry,
+            source_type: SourceType::UncategorizedRegistry,
         };
         let rdap_response = RdapResponse::ErrorResponse(
             icann_rdap_common::response::error::Error::builder()

diff --git a/icann-rdap-client/src/request.rs → icann-rdap-client/src/rr.rs b/icann-rdap-client/src/request.rs → icann-rdap-client/src/rr.rs
@@ -1,4 +1,4 @@
-//! Structures that describe a request.
+//! Structures that describe a request/response.
 
 use icann_rdap_common::check::Checks;
 use serde::{Deserialize, Serialize};