Make the 'core.network' module private

src/core/mod.rs

@@ -1,3 +1,3 @@
-pub mod network;
+mod network;
 pub mod requests;
 pub mod types;

src/core/network/mod.rs

@@ -3,9 +3,9 @@ use serde::de::DeserializeOwned;
 use serde_json::Value;
 use reqwest::{
     r#async::{Client, multipart::Form},
-    StatusCode,
 };
 use apply::Apply;
+use crate::core::requests::{RequestError, ResponseResult};
 
 
 const TELEGRAM_API_URL: &str = "https://api.telegram.org";
@@ -31,32 +31,6 @@ fn file_url(base: &str, token: &str, file_path: &str) -> String {
     )
 }
 
-#[derive(Debug, Display)]
-pub enum RequestError {
-    #[display(fmt = "Telegram error #{}: {}", status_code, description)]
-    ApiError {
-        status_code: StatusCode,
-        description: String,
-    },
-
-    #[display(fmt = "Network error: {err}", err = _0)]
-    NetworkError(reqwest::Error),
-
-    #[display(fmt = "InvalidJson error caused by: {err}", err = _0)]
-    InvalidJson(serde_json::Error),
-}
-
-impl std::error::Error for RequestError {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        match self {
-            RequestError::ApiError { .. } => None,
-            RequestError::NetworkError(err) => Some(err),
-            RequestError::InvalidJson(err) => Some(err),
-        }
-    }
-}
-
-pub type ResponseResult<T> = Result<T, RequestError>;
 
 pub async fn request<T: DeserializeOwned>(
     client: &Client,

src/core/requests/get_me.rs

@@ -1,12 +1,13 @@
 use crate::core::{
     types::User,
     network::{
-        request, ResponseResult,
+        request,
     },
     requests::{
         Request, RequestInfo, RequestFuture,
     }
 };
+use crate::core::requests::ResponseResult;
 
 
 #[derive(Debug, Constructor)]

src/core/requests/mod.rs

@@ -1,13 +1,38 @@
 use std::future::Future;
 
-use crate::core::network::ResponseResult;
-
 use serde::de::DeserializeOwned;
 use reqwest::r#async::Client;
+use reqwest::StatusCode;
 
 
 mod form_builder;
 
+#[derive(Debug, Display)]
+pub enum RequestError {
+    #[display(fmt = "Telegram error #{}: {}", status_code, description)]
+    ApiError {
+        status_code: StatusCode,
+        description: String,
+    },
+
+    #[display(fmt = "Network error: {err}", err = _0)]
+    NetworkError(reqwest::Error),
+
+    #[display(fmt = "InvalidJson error caused by: {err}", err = _0)]
+    InvalidJson(serde_json::Error),
+}
+
+impl std::error::Error for RequestError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        match self {
+            RequestError::ApiError { .. } => None,
+            RequestError::NetworkError(err) => Some(err),
+            RequestError::InvalidJson(err) => Some(err),
+        }
+    }
+}
+
+pub type ResponseResult<T> = Result<T, RequestError>;
 
 /// Request that can be sent to telegram.
 /// `ReturnValue` - a type that will be returned from Telegram.

src/core/requests/send_message.rs

@@ -1,7 +1,7 @@
 use crate::core::{
     types::Message,
     network::{
-        request, ResponseResult,
+        request,
     },
     requests::{
         form_builder::FormBuilder,
@@ -11,6 +11,7 @@ use crate::core::{
         RequestFuture,
     }
 };
+use crate::core::requests::ResponseResult;
 
 
 #[derive(Debug, TypedBuilder)]