Move modules to files

src/requests/json.rs

@@ -0,0 +1,30 @@
+use serde::{de::DeserializeOwned, Serialize};
+
+use crate::{Bot, network};
+use super::{ResponseResult, Method};
+
+pub trait Payload: Serialize + Method {}
+
+pub struct Request<'b, P> {
+    bot: &'b Bot,
+    pub(crate) payload: P,
+}
+
+impl<'b, P> Request<'b, P>
+where
+    P: Payload,
+    P::Output: DeserializeOwned,
+{
+    pub fn new(bot: &'b Bot, payload: P) -> Self {
+        Self { bot, payload }
+    }
+
+    pub async fn send(&self) -> ResponseResult<P::Output> {
+        network::request_json(
+            self.bot.client(),
+            self.bot.token(),
+            P::METHOD,
+            &self.payload,
+        ).await
+    }
+}

src/requests/mod.rs

@@ -115,90 +115,6 @@ pub trait Method {
     const METHOD: &'static str;
 }
 
-pub mod json {
-    use serde::{de::DeserializeOwned, Serialize};
-
-    use crate::{Bot, network};
-    use super::{ResponseResult, Method};
-
-    pub trait Payload: Serialize + Method {}
-
-    pub struct Request<'b, P> {
-        pub(crate) bot: &'b Bot,
-        pub(crate) payload: P,
-    }
-
-    impl<P> Request<'_, P>
-    where
-        P: Payload,
-        P::Output: DeserializeOwned,
-    {
-        pub async fn send(&self) -> ResponseResult<P::Output> {
-            network::request_json(
-                self.bot.client(),
-                self.bot.token(),
-                P::METHOD,
-                &self.payload,
-            ).await
-        }
-    }
-}
-
-pub mod multipart {
-    use serde::de::DeserializeOwned;
-    use reqwest::multipart;
-
-    use crate::{Bot, network};
-    use super::{ResponseResult, Method};
-
-    pub trait Payload: Method {
-        fn payload(&self) -> multipart::Form;
-    }
-
-    pub struct Request<'b, P> {
-        pub(crate) bot: &'b Bot,
-        pub(crate) payload: P,
-    }
-
-    impl<P> Request<'_, P>
-    where
-        P: Payload,
-        P::Output: DeserializeOwned,
-    {
-        pub async fn send(&self) -> ResponseResult<P::Output> {
-            network::request_multipart(
-                self.bot.client(),
-                self.bot.token(),
-                P::METHOD,
-                self.payload.payload(),
-            ).await
-        }
-    }
-}
-
-pub mod simple {
-    use serde::de::DeserializeOwned;
-    use reqwest::multipart;
-
-    use crate::{Bot, network};
-    use super::{ResponseResult, Method};
-
-    pub struct Request<'b, M> {
-        pub(crate) bot: &'b Bot,
-        marker: std::marker::PhantomData<M>,
-    }
-
-    impl<M> Request<'_, M>
-    where
-        M: Method,
-        M::Output: DeserializeOwned,
-    {
-        pub async fn send(&self) -> ResponseResult<M::Output> {
-            network::request_simple(
-                self.bot.client(),
-                self.bot.token(),
-                M::METHOD,
-            ).await
-        }
-    }
-}
+pub mod json;
+pub mod multipart;
+pub mod simple;

src/requests/multipart.rs

@@ -0,0 +1,33 @@
+use serde::de::DeserializeOwned;
+use reqwest::multipart;
+
+use crate::{Bot, network};
+use super::{ResponseResult, Method};
+
+pub trait Payload: Method {
+    fn payload(&self) -> multipart::Form;
+}
+
+pub struct Request<'b, P> {
+    bot: &'b Bot,
+    pub(crate) payload: P,
+}
+
+impl<'b, P> Request<'b, P>
+where
+    P: Payload,
+    P::Output: DeserializeOwned,
+{
+    pub fn new(bot: &'b Bot, payload: P) -> Self {
+        Self { bot, payload }
+    }
+
+    pub async fn send(&self) -> ResponseResult<P::Output> {
+        network::request_multipart(
+            self.bot.client(),
+            self.bot.token(),
+            P::METHOD,
+            self.payload.payload(),
+        ).await
+    }
+}

src/requests/simple.rs

@@ -0,0 +1,29 @@
+use serde::de::DeserializeOwned;
+use reqwest::multipart;
+
+use crate::{Bot, network};
+use super::{ResponseResult, Method};
+use std::marker::PhantomData;
+
+pub struct Request<'b, M> {
+    bot: &'b Bot,
+    marker: PhantomData<M>,
+}
+
+impl<'b, M> Request<'b, M>
+where
+    M: Method,
+    M::Output: DeserializeOwned,
+{
+    pub fn new(bot: &'b Bot) -> Self {
+        Self { bot, marker: PhantomData }
+    }
+
+    pub async fn send(&self) -> ResponseResult<M::Output> {
+        network::request_simple(
+            self.bot.client(),
+            self.bot.token(),
+            M::METHOD,
+        ).await
+    }
+}