Run cargo fmt

src/bot/mod.rs

@@ -1,24 +1,15 @@
 use reqwest::r#async::Client;
 
 use crate::core::{
-    types::{
-        InputFile,
-        InputMedia,
-    },
     requests::{
-        ChatId,
-        RequestContext,
-
-        get_me::GetMe,
-        send_message::SendMessage,
         edit_message_live_location::EditMessageLiveLocation,
-        forward_message::ForwardMessage,
+        forward_message::ForwardMessage, get_me::GetMe, send_audio::SendAudio,
-        send_audio::SendAudio,
+        send_location::SendLocation, send_media_group::SendMediaGroup,
-        send_location::SendLocation,
+        send_message::SendMessage, send_photo::SendPhoto,
-        send_media_group::SendMediaGroup,
+        stop_message_live_location::StopMessageLiveLocation, ChatId,
-        send_photo::SendPhoto,
+        RequestContext,
-        stop_message_live_location::StopMessageLiveLocation,
+    },
-    }
+    types::{InputFile, InputMedia},
 };
 
 pub struct Bot {
@@ -60,11 +51,7 @@ impl Bot {
         C: Into<ChatId>,
         T: Into<String>,
     {
-        SendMessage::new(
+        SendMessage::new(self.ctx(), chat_id.into(), text.into())
-            self.ctx(),
-            chat_id.into(),
-            text.into(),
-        )
     }
 
     pub fn edit_message_live_location<Lt, Lg>(
@@ -87,7 +74,7 @@ impl Bot {
         &self,
         chat_id: C,
         from_chat_id: F,
-        message_id: M
+        message_id: M,
     ) -> ForwardMessage
     where
         C: Into<ChatId>,
@@ -107,11 +94,7 @@ impl Bot {
         C: Into<ChatId>,
         A: Into<InputFile>,
     {
-        SendAudio::new(
+        SendAudio::new(self.ctx(), chat_id.into(), audio.into())
-            self.ctx(),
-            chat_id.into(),
-            audio.into()
-        )
     }
 
     pub fn send_location<C, Lt, Lg>(
@@ -136,30 +119,20 @@ impl Bot {
     pub fn send_media_group<C, M>(&self, chat_id: C, media: M) -> SendMediaGroup
     where
         C: Into<ChatId>,
-        M: Into<Vec<InputMedia>>
+        M: Into<Vec<InputMedia>>,
     {
-        SendMediaGroup::new(
+        SendMediaGroup::new(self.ctx(), chat_id.into(), media.into())
-            self.ctx(),
-            chat_id.into(),
-            media.into(),
-        )
     }
 
     pub fn send_photo<C, P>(&self, chat_id: C, photo: P) -> SendPhoto
     where
         C: Into<ChatId>,
-        P: Into<InputFile>
+        P: Into<InputFile>,
     {
-        SendPhoto::new(
+        SendPhoto::new(self.ctx(), chat_id.into(), photo.into())
-            self.ctx(),
-            chat_id.into(),
-            photo.into(),
-        )
     }
 
     pub fn stop_message_live_location(&self) -> StopMessageLiveLocation {
-        StopMessageLiveLocation::new(
+        StopMessageLiveLocation::new(self.ctx())
-            self.ctx()
-        )
     }
 }

src/core/requests/answer_pre_checkout_query.rs

@@ -1,6 +1,6 @@
 use crate::core::{
-    requests::{RequestContext, Request, RequestFuture, ResponseResult},
+    network,
-    network
+    requests::{Request, RequestContext, RequestFuture, ResponseResult},
 };
 
 #[derive(Debug, Serialize, Clone)]
@@ -40,8 +40,9 @@ impl<'a> Request<'a> for AnswerPreCheckoutQuery<'a> {
                 &self.ctx.client,
                 &self.ctx.token,
                 "answerPreCheckoutQuery",
-                &self
+                &self,
-            ).await
+            )
+            .await
         })
     }
 }
@@ -50,32 +51,35 @@ impl<'a> AnswerPreCheckoutQuery<'a> {
     pub(crate) fn new(
         ctx: RequestContext<'a>,
         pre_checkout_query_id: String,
-        ok: bool
+        ok: bool,
     ) -> Self {
         Self {
             ctx,
             pre_checkout_query_id,
             ok,
-            error_message: None
+            error_message: None,
         }
     }
 
     pub fn pre_checkout_query_id<T>(mut self, pre_checkout_query_id: T) -> Self
-        where T: Into<String>
+    where
+        T: Into<String>,
     {
         self.pre_checkout_query_id = pre_checkout_query_id.into();
         self
     }
 
     pub fn ok<T>(mut self, ok: T) -> Self
-        where T: Into<bool>
+    where
+        T: Into<bool>,
     {
         self.ok = ok.into();
         self
     }
 
     pub fn error_message<T>(mut self, error_message: T) -> Self
-        where T: Into<String>
+    where
+        T: Into<String>,
     {
         self.error_message = Some(error_message.into());
         self

src/core/requests/answer_shipping_query.rs

@@ -1,6 +1,8 @@
-use crate::core::types::ShippingOption;
-use crate::core::requests::{RequestContext, Request, RequestFuture, ResponseResult};
 use crate::core::network;
+use crate::core::requests::{
+    Request, RequestContext, RequestFuture, ResponseResult,
+};
+use crate::core::types::ShippingOption;
 
 #[derive(Debug, Clone, Serialize)]
 /// If you sent an invoice requesting a shipping address and the parameter
@@ -40,8 +42,9 @@ impl<'a> Request<'a> for AnswerShippingQuery<'a> {
                 &self.ctx.client,
                 &self.ctx.token,
                 "answerShippingQuery",
-                &self
+                &self,
-            ).await
+            )
+            .await
         })
     }
 }
@@ -50,40 +53,44 @@ impl<'a> AnswerShippingQuery<'a> {
     pub(crate) fn new(
         ctx: RequestContext<'a>,
         shipping_query_id: String,
-        ok: bool
+        ok: bool,
     ) -> Self {
         Self {
             ctx,
             shipping_query_id,
             ok,
             shipping_options: None,
-            error_message: None
+            error_message: None,
         }
     }
 
     pub fn shipping_query_id<T>(mut self, shipping_query_id: T) -> Self
-        where T: Into<String>
+    where
+        T: Into<String>,
     {
         self.shipping_query_id = shipping_query_id.into();
         self
     }
 
     pub fn ok<T>(mut self, ok: T) -> Self
-        where T: Into<bool>
+    where
+        T: Into<bool>,
     {
         self.ok = ok.into();
         self
     }
 
     pub fn shipping_options<T>(mut self, shipping_options: T) -> Self
-        where T: Into<Vec<ShippingOption>>
+    where
+        T: Into<Vec<ShippingOption>>,
     {
         self.shipping_options = Some(shipping_options.into());
         self
     }
 
     pub fn error_message<T>(mut self, error_message: T) -> Self
-        where T: Into<String>
+    where
+        T: Into<String>,
     {
         self.error_message = Some(error_message.into());
         self

src/core/requests/forward_message.rs

@@ -1,11 +1,7 @@
 use crate::core::{
     network,
     requests::{
-        ChatId,
+        ChatId, Request, RequestContext, RequestFuture, ResponseResult,
-        Request,
-        RequestFuture,
-        RequestContext,
-        ResponseResult,
     },
     types::Message,
 };

src/core/requests/get_file.rs

@@ -1,9 +1,11 @@
-use crate::core::requests::{RequestContext, RequestFuture, ResponseResult, Request};
-use crate::core::types::File;
 use crate::core::network;
+use crate::core::requests::{
+    Request, RequestContext, RequestFuture, ResponseResult,
+};
+use crate::core::types::File;
 
-/// Use this method to get basic info about a file and prepare it for downloading.
+/// Use this method to get basic info about a file and prepare it for
-/// For the moment, bots can download files of up to 20MB in size.
+/// downloading. For the moment, bots can download files of up to 20MB in size.
 /// On success, a File object is returned.
 /// The file can then be downloaded via the link https://api.telegram.org/file/bot<token>/<file_path>,
 /// where <file_path> is taken from the response.
@@ -14,10 +16,9 @@ struct GetFile<'a> {
     #[serde(skip_serializing)]
     ctx: RequestContext<'a>,
     /// File identifier to get info about
-    file_id: String
+    file_id: String,
 }
 
-
 impl<'a> Request<'a> for GetFile<'a> {
     type ReturnValue = File;
 
@@ -34,8 +35,7 @@ impl<'a> Request<'a> for GetFile<'a> {
     }
 }
 
-
+impl<'a> GetFile<'a> {
-impl<'a> GetFile<'a>{
     pub fn file_id<T>(mut self, file_id: T) -> Self
     where
         T: Into<String>,

src/core/requests/send_chat_action.rs

@@ -1,9 +1,12 @@
 use crate::core::network;
-use crate::core::requests::{ChatId, Request, RequestContext, RequestFuture, ResponseResult};
+use crate::core::requests::{
+    ChatId, Request, RequestContext, RequestFuture, ResponseResult,
+};
 
-///Use this method when you need to tell the user that something is happening on the bot's side.
+///Use this method when you need to tell the user that something is happening
-///The status is set for 5 seconds or less (when a message arrives from your bot, Telegram clients clear its typing status).
+/// on the bot's side. The status is set for 5 seconds or less (when a message
-///Returns True on success.
+/// arrives from your bot, Telegram clients clear its typing status).
+/// Returns True on success.
 #[derive(Debug, Clone, Serialize)]
 struct SendChatAction<'a> {
     #[serde(skip_serializing)]
@@ -71,7 +74,6 @@ impl<'a> SendChatAction<'a> {
         self
     }
 
-
     pub fn action<T>(mut self, action: T) -> Self
     where
         T: Into<ChatAction>,

src/core/requests/send_message.rs

@@ -1,11 +1,7 @@
 use crate::core::{
     network,
     requests::{
-        ChatId,
+        ChatId, Request, RequestContext, RequestFuture, ResponseResult,
-        Request,
-        RequestFuture,
-        RequestContext,
-        ResponseResult,
     },
     types::{Message, ParseMode, ReplyMarkup},
 };

src/core/requests/stop_message_live_location.rs

@@ -1,11 +1,7 @@
 use crate::core::{
     network,
     requests::{
-        ChatId,
+        ChatId, Request, RequestContext, RequestFuture, ResponseResult,
-        Request,
-        RequestFuture,
-        RequestContext,
-        ResponseResult,
     },
     types::{InlineKeyboardMarkup, Message},
 };

src/core/requests/utils.rs

@@ -2,11 +2,7 @@ use std::path::PathBuf;
 
 use bytes::{Bytes, BytesMut};
 use reqwest::r#async::multipart::Part;
-use tokio::{
+use tokio::{codec::FramedRead, prelude::*};
-    prelude::*,
-    codec::FramedRead,
-};
-
 
 struct FileDecoder;
 

src/core/types/animation.rs

@@ -19,7 +19,7 @@ pub struct Animation {
     /// Optional. MIME type of the file as defined by sender
     pub mime_type: Option<String>,
     /// Optional. File size
-    pub file_size: Option<u32>
+    pub file_size: Option<u32>,
 }
 
 #[cfg(test)]
@@ -51,11 +51,11 @@ mod tests {
                 file_id: "id".to_string(),
                 width: 320,
                 height: 320,
-                file_size: Some(3452)
+                file_size: Some(3452),
             }),
             file_name: Some("some".to_string()),
             mime_type: Some("gif".to_string()),
-            file_size: Some(6500)
+            file_size: Some(6500),
         };
         let actual = serde_json::from_str::<Animation>(json).unwrap();
         assert_eq!(actual, expected)

src/core/types/callback_query.rs

@@ -1,6 +1,7 @@
-use crate::core::types::{User, Message};
+use crate::core::types::{Message, User};
 
-/// This object represents an incoming callback query from a callback button in an inline keyboard.
+/// This object represents an incoming callback query from a callback button in
+/// an inline keyboard.
 #[derive(Debug, Deserialize, PartialEq, Clone)]
 pub struct CallbackQuery {
     /// Unique identifier for this query
@@ -8,12 +9,14 @@ pub struct CallbackQuery {
     /// Sender
     pub from: User,
     /// Message with the callback button that originated the query.
-    /// Note that message content and message date will not be available if the message is too old
+    /// Note that message content and message date will not be available if the
+    /// message is too old
     pub message: Message,
-    /// Global identifier, uniquely corresponding to the chat to which the message
+    /// Global identifier, uniquely corresponding to the chat to which the
-    /// with the callback button was sent. Useful for high scores in games.
+    /// message with the callback button was sent. Useful for high scores
+    /// in games.
     pub chat_instance: String,
-    /// Data associated with the callback button. Be aware that a bad client can
+    /// Data associated with the callback button. Be aware that a bad client
-    /// send arbitrary data in this field.
+    /// can send arbitrary data in this field.
     pub data: String,
 }

src/core/types/chat.rs

@@ -1,6 +1,5 @@
 use crate::core::types::{ChatPermissions, ChatPhoto, Message};
 
-
 #[derive(Debug, Deserialize, PartialEq, Clone)]
 pub struct Chat {
     pub id: i64,
@@ -9,7 +8,6 @@ pub struct Chat {
     pub photo: Option<ChatPhoto>,
 }
 
-
 #[derive(Debug, Deserialize, PartialEq, Clone)]
 #[serde(untagged)]
 pub enum ChatKind {

src/core/types/chosen_inline_result.rs

@@ -1,4 +1,4 @@
-use crate::core::types::{User, Location};
+use crate::core::types::{Location, User};
 
 #[derive(Debug, Deserialize, Clone, PartialEq)]
 /// Represents a result of an inline query that was chosen by the user and
@@ -11,9 +11,9 @@ pub struct ChosenInlineResult {
     pub from: User,
     /// Optional. Sender location, only for bots that require user location
     pub location: Option<Location>,
-    /// Optional. Identifier of the sent inline message. Available only if there is an inline
+    /// Optional. Identifier of the sent inline message. Available only if
-    /// keyboard attached to the message. Will be also received in callback queries and can
+    /// there is an inline keyboard attached to the message. Will be also
-    /// be used to edit the message.
+    /// received in callback queries and can be used to edit the message.
     pub inline_message_id: Option<String>,
     /// The query that was used to obtain the result
     pub query: String,

src/core/types/file.rs

@@ -2,5 +2,5 @@
 pub struct File {
     pub file_id: String,
     pub file_size: u32,
-    pub file_path: String
+    pub file_path: String,
 }

src/core/types/game.rs

@@ -1,10 +1,10 @@
 use serde::Deserialize;
 
-use crate::core::types::{MessageEntity, PhotoSize, Animation};
+use crate::core::types::{Animation, MessageEntity, PhotoSize};
 
 #[derive(Debug, Deserialize, Clone, PartialEq, Eq, Hash)]
-/// This object represents a game. Use BotFather to create and edit games, their short names
+/// This object represents a game. Use BotFather to create and edit games, their
-/// will act as unique identifiers.
+/// short names will act as unique identifiers.
 pub struct Game {
     /// Title of the game
     pub title: String,
@@ -12,13 +12,15 @@ pub struct Game {
     pub description: String,
     /// Photo that will be displayed in the game message in chats.
     pub photo: Vec<PhotoSize>,
-    /// Optional. Brief description of the game or high scores included in the game message.
+    /// Optional. Brief description of the game or high scores included in the
-    /// Can be automatically edited to include current high scores for the game when
+    /// game message. Can be automatically edited to include current high
-    /// the bot calls setGameScore, or manually edited using editMessageText. 0-4096 characters.
+    /// scores for the game when the bot calls setGameScore, or manually
+    /// edited using editMessageText. 0-4096 characters.
     pub text: Option<String>,
-    /// Optional. Special entities that appear in text, such as usernames, URLs, bot commands, etc.
+    /// Optional. Special entities that appear in text, such as usernames,
+    /// URLs, bot commands, etc.
     pub text_entities: Option<Vec<MessageEntity>>,
-    /// Optional. Animation that will be displayed in the game message in chats.
+    /// Optional. Animation that will be displayed in the game message in
-    /// Upload via BotFather
+    /// chats. Upload via BotFather
     pub animation: Option<Animation>,
 }

src/core/types/inline_keyboard_button.rs

@@ -62,32 +62,37 @@ impl InlineKeyboardButton {
         }
     }
 
-    pub fn callback(text: String, callback_data: String)
+    pub fn callback(
-                    -> InlineKeyboardButton {
+        text: String,
+        callback_data: String,
+    ) -> InlineKeyboardButton {
         InlineKeyboardButton {
             text,
             kind: InlineKeyboardButtonKind::CallbackData(callback_data),
         }
     }
 
-    pub fn switch_inline_query(text: String, switch_inline_query: String)
+    pub fn switch_inline_query(
-                               -> InlineKeyboardButton {
+        text: String,
+        switch_inline_query: String,
+    ) -> InlineKeyboardButton {
         InlineKeyboardButton {
             text,
-            kind: InlineKeyboardButtonKind::SwitchInlineQuery(switch_inline_query)
+            kind: InlineKeyboardButtonKind::SwitchInlineQuery(
+                switch_inline_query,
+            ),
         }
     }
 
     pub fn switch_inline_query_current_chat(
         text: String,
-        switch_inline_query_current_chat: String
+        switch_inline_query_current_chat: String,
     ) -> InlineKeyboardButton {
-
         InlineKeyboardButton {
             text,
             kind: InlineKeyboardButtonKind::SwitchInlineQueryCurrentChat(
-                switch_inline_query_current_chat
+                switch_inline_query_current_chat,
-            )
+            ),
         }
     }
 }

src/core/types/inline_keyboard_markup.rs

@@ -17,22 +17,19 @@ pub struct InlineKeyboardMarkup {
 /// Example:
 /// ```
 /// use async_telegram_bot::core::types::{
-///     InlineKeyboardMarkup,
+///     InlineKeyboardButton, InlineKeyboardMarkup,
-///     InlineKeyboardButton
 /// };
 ///
-///
 /// let url_button = InlineKeyboardButton::url(
 ///     "text".to_string(),
-///     "http://url.com".to_string()
+///     "http://url.com".to_string(),
 /// );
-/// let keyboard = InlineKeyboardMarkup::new()
+/// let keyboard = InlineKeyboardMarkup::new().append_row(vec![url_button]);
-///     .append_row(vec![url_button]);
 /// ```
 impl InlineKeyboardMarkup {
     pub fn new() -> Self {
         Self {
-            inline_keyboard: vec![]
+            inline_keyboard: vec![],
         }
     }
 
@@ -41,11 +38,14 @@ impl InlineKeyboardMarkup {
         self
     }
 
-    pub fn append_to_row(mut self, button: InlineKeyboardButton, index: usize)
+    pub fn append_to_row(
-                         -> Self {
+        mut self,
+        button: InlineKeyboardButton,
+        index: usize,
+    ) -> Self {
         match self.inline_keyboard.get_mut(index) {
             Some(buttons) => buttons.push(button),
-            None => self.inline_keyboard.push(vec![button])
+            None => self.inline_keyboard.push(vec![button]),
         };
         self
     }
@@ -68,9 +68,7 @@ mod tests {
         let markup = InlineKeyboardMarkup::new()
             .append_row(vec![button1.clone(), button2.clone()]);
         let expected = InlineKeyboardMarkup {
-            inline_keyboard: vec![
+            inline_keyboard: vec![vec![button1.clone(), button2.clone()]],
-                vec![button1.clone(), button2.clone()]
-            ]
         };
         assert_eq!(markup, expected);
     }
@@ -89,9 +87,7 @@ mod tests {
             .append_row(vec![button1.clone()])
             .append_to_row(button2.clone(), 0);
         let expected = InlineKeyboardMarkup {
-            inline_keyboard: vec![
+            inline_keyboard: vec![vec![button1.clone(), button2.clone()]],
-                vec![button1.clone(), button2.clone()]
-            ]
         };
         assert_eq!(markup, expected);
     }
@@ -110,10 +106,7 @@ mod tests {
             .append_row(vec![button1.clone()])
             .append_to_row(button2.clone(), 1);
         let expected = InlineKeyboardMarkup {
-            inline_keyboard: vec![
+            inline_keyboard: vec![vec![button1.clone()], vec![button2.clone()]],
-                vec![button1.clone()],
-                vec![button2.clone()]
-            ]
         };
         assert_eq!(markup, expected);
     }

src/core/types/inline_query.rs

@@ -1,4 +1,4 @@
-use crate::core::types::{User, Location};
+use crate::core::types::{Location, User};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQuery {

src/core/types/inline_query_result.rs

@@ -1,26 +1,16 @@
 use crate::core::types::{
-    InlineQueryResultCachedAudio,
+    InlineQueryResultArticle, InlineQueryResultAudio,
-    InlineQueryResultCachedDocument,
+    InlineQueryResultCachedAudio, InlineQueryResultCachedDocument,
-    InlineQueryResultCachedGif,
+    InlineQueryResultCachedGif, InlineQueryResultCachedMpeg4Gif,
-    InlineQueryResultCachedMpeg4Gif,
+    InlineQueryResultCachedPhoto, InlineQueryResultCachedSticker,
-    InlineQueryResultCachedPhoto,
+    InlineQueryResultCachedVideo, InlineQueryResultCachedVoice,
-    InlineQueryResultCachedSticker,
+    InlineQueryResultContact, InlineQueryResultDocument, InlineQueryResultGame,
-    InlineQueryResultCachedVideo,
+    InlineQueryResultGif, InlineQueryResultLocation, InlineQueryResultMpeg4Gif,
-    InlineQueryResultCachedVoice,
+    InlineQueryResultPhoto, InlineQueryResultVenue, InlineQueryResultVideo,
-    InlineQueryResultArticle,
+    InlineQueryResultVoice,
-    InlineQueryResultAudio,
-    InlineQueryResultContact,
-    InlineQueryResultGame,
-    InlineQueryResultDocument,
-    InlineQueryResultGif,
-    InlineQueryResultLocation,
-    InlineQueryResultMpeg4Gif,
-    InlineQueryResultPhoto,
-    InlineQueryResultVenue,
-    InlineQueryResultVideo,
-    InlineQueryResultVoice
 };
 
+/// This object represents one result of an inline query.
 #[derive(Debug, Serialize, PartialEq, Clone)]
 #[serde(tag = "type")]
 #[serde(rename_all = "snake_case")]
@@ -59,24 +49,26 @@ pub enum InlineQueryResult {
 
 #[cfg(test)]
 mod tests {
-    use crate::core::types::{InlineQueryResult, InlineQueryResultCachedAudio, InputMessageContent};
-    use crate::core::types::parse_mode::ParseMode;
     use crate::core::types::inline_keyboard_markup::InlineKeyboardMarkup;
+    use crate::core::types::parse_mode::ParseMode;
+    use crate::core::types::{
+        InlineQueryResult, InlineQueryResultCachedAudio, InputMessageContent,
+    };
 
     #[test]
     fn cached_audio_min_serialize() {
-        let structure = InlineQueryResult::CachedAudio(
+        let structure =
-            InlineQueryResultCachedAudio {
+            InlineQueryResult::CachedAudio(InlineQueryResultCachedAudio {
                 id: String::from("id"),
                 audio_file_id: String::from("audio_file_id"),
                 caption: None,
                 parse_mode: None,
                 reply_markup: None,
-                input_message_content: None
+                input_message_content: None,
-            }
+            });
-        );
 
-        let expected_json = r#"{"type":"audio","id":"id","audio_file_id":"audio_file_id"}"#;
+        let expected_json =
+            r#"{"type":"audio","id":"id","audio_file_id":"audio_file_id"}"#;
         let actual_json = serde_json::to_string(&structure).unwrap();
 
         assert_eq!(expected_json, actual_json);
@@ -84,8 +76,8 @@ mod tests {
 
     #[test]
     fn cached_audio_full_serialize() {
-        let structure = InlineQueryResult::CachedAudio(
+        let structure =
-            InlineQueryResultCachedAudio {
+            InlineQueryResult::CachedAudio(InlineQueryResultCachedAudio {
                 id: String::from("id"),
                 audio_file_id: String::from("audio_file_id"),
                 caption: Some(String::from("caption")),
@@ -94,10 +86,9 @@ mod tests {
                 input_message_content: Some(InputMessageContent::Text {
                     message_text: String::from("message_text"),
                     parse_mode: Some(ParseMode::Markdown),
-                    disable_web_page_preview: Some(true)
+                    disable_web_page_preview: Some(true),
-                })
+                }),
-            }
+            });
-        );
 
         let expected_json = r#"{"type":"audio","id":"id","audio_file_id":"audio_file_id","caption":"caption","parse_mode":"HTML","reply_markup":{"inline_keyboard":[]},"input_message_content":{"message_text":"message_text","parse_mode":"Markdown","disable_web_page_preview":true}}"#;
         let actual_json = serde_json::to_string(&structure).unwrap();

src/core/types/inline_query_result_article.rs

@@ -1,4 +1,4 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
+use crate::core::types::{InlineKeyboardMarkup, InputMessageContent};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultArticle {
@@ -14,7 +14,8 @@ pub struct InlineQueryResultArticle {
     /// Optional. URL of the result
     #[serde(skip_serializing_if = "Option::is_none")]
     pub url: Option<String>,
-    /// Optional. Pass True, if you don't want the URL to be shown in the message
+    /// Optional. Pass True, if you don't want the URL to be shown in the
+    /// message
     #[serde(skip_serializing_if = "Option::is_none")]
     pub hide_url: Option<bool>,
     /// Optional. Short description of the result

src/core/types/inline_query_result_audio.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{ParseMode, InlineKeyboardMarkup, InputMessageContent};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultAudio {

src/core/types/inline_query_result_cached_audio.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedAudio {

src/core/types/inline_query_result_cached_document.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedDocument {

src/core/types/inline_query_result_cached_gif.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedGif {

src/core/types/inline_query_result_cached_mpeg4_gif.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedMpeg4Gif {

src/core/types/inline_query_result_cached_photo.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedPhoto {

src/core/types/inline_query_result_cached_sticker.rs

@@ -1,4 +1,4 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup};
+use crate::core::types::{InlineKeyboardMarkup, InputMessageContent};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedSticker {

src/core/types/inline_query_result_cached_video.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedVideo {

src/core/types/inline_query_result_cached_voice.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultCachedVoice {

src/core/types/inline_query_result_contact.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultContact {

src/core/types/inline_query_result_document.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultDocument {

src/core/types/inline_query_result_game.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, Hash, PartialEq, Eq, Clone)]
 pub struct InlineQueryResultGame {

src/core/types/inline_query_result_gif.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultGif {

src/core/types/inline_query_result_location.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultLocation {

src/core/types/inline_query_result_mpeg4_gif.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultMpeg4Gif {

src/core/types/inline_query_result_photo.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultPhoto {

src/core/types/inline_query_result_venue.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultVenue {

src/core/types/inline_query_result_video.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultVideo {

src/core/types/inline_query_result_voice.rs

@@ -1,4 +1,6 @@
-use crate::core::types::{InputMessageContent, InlineKeyboardMarkup, ParseMode};
+use crate::core::types::{
+    InlineKeyboardMarkup, InputMessageContent, ParseMode,
+};
 
 #[derive(Debug, Serialize, PartialEq, Clone)]
 pub struct InlineQueryResultVoice {

src/core/types/input_message_content.rs

@@ -8,18 +8,20 @@ use crate::core::types::ParseMode;
 /// a result of an inline query.
 /// [More](https://core.telegram.org/bots/api#inputmessagecontent)
 pub enum InputMessageContent {
-    /// Represents the content of a text message to be sent as the result of an inline query.
+    /// Represents the content of a text message to be sent as the result of an
+    /// inline query.
     Text {
         /// Text of the message to be sent, 1-4096 characters
         message_text: String,
 
         /// Send [Markdown] or [HTML],
-        /// if you want Telegram apps to show [bold, italic, fixed-width text or inline URLs]
+        /// if you want Telegram apps to show [bold, italic, fixed-width text
-        /// in the media caption.
+        /// or inline URLs] in the media caption.
         ///
         /// [Markdown]: crate::core::types::ParseMode::Markdown
         /// [Html]: crate::core::types::ParseMode::Html
-        /// [bold, italic, fixed-width text or inline URLs]: crate::core::types::ParseMode
+        /// [bold, italic, fixed-width text or inline URLs]:
+        /// crate::core::types::ParseMode
         #[serde(skip_serializing_if = "Option::is_none")]
         parse_mode: Option<ParseMode>,
 
@@ -27,18 +29,21 @@ pub enum InputMessageContent {
         #[serde(skip_serializing_if = "Option::is_none")]
         disable_web_page_preview: Option<bool>,
     },
-    /// Represents the content of a location message to be sent as the result of an inline query.
+    /// Represents the content of a location message to be sent as the result
+    /// of an inline query.
     Location {
         /// Latitude of the location in degrees
         latitude: f64,
         /// Longitude of the location in degrees
         longitude: f64,
 
-        /// Period in seconds for which the location can be updated, should be between 60 and 86400.
+        /// Period in seconds for which the location can be updated, should be
+        /// between 60 and 86400.
         #[serde(skip_serializing_if = "Option::is_none")]
         live_period: Option<u32>,
     },
-    /// Represents the content of a venue message to be sent as the result of an inline query.
+    /// Represents the content of a venue message to be sent as the result of
+    /// an inline query.
     Venue {
         /// Latitude of the venue in degrees
         latitude: f64,
@@ -53,12 +58,14 @@ pub enum InputMessageContent {
         #[serde(skip_serializing_if = "Option::is_none")]
         foursquare_id: Option<String>,
 
-        /// Foursquare type of the venue, if known. (For example, “arts_entertainment/default”,
+        /// Foursquare type of the venue, if known. (For example,
-        /// “arts_entertainment/aquarium” or “food/icecream”.)
+        /// “arts_entertainment/default”, “arts_entertainment/aquarium”
+        /// or “food/icecream”.)
         #[serde(skip_serializing_if = "Option::is_none")]
         foursquare_type: Option<String>,
     },
-    /// Represents the content of a contact message to be sent as the result of an inline query.
+    /// Represents the content of a contact message to be sent as the result of
+    /// an inline query.
     Contact {
         /// Contact's phone number
         phone_number: String,
@@ -124,7 +131,8 @@ mod tests {
 
     #[test]
     fn contact_serialize() {
-        let expected_json = r#"{"phone_number":"+3800000000","first_name":"jhon"}"#;
+        let expected_json =
+            r#"{"phone_number":"+3800000000","first_name":"jhon"}"#;
         let contact_content = InputMessageContent::Contact {
             phone_number: String::from("+3800000000"),
             first_name: String::from("jhon"),

src/core/types/label_price.rs

@@ -20,7 +20,7 @@ mod tests {
     fn serialize() {
         let labeled_price = LabeledPrice {
             label: "Label".to_string(),
-            amount: 60
+            amount: 60,
         };
         let expected = r#"{"label":"Label","amount":60}"#;
         let actual = serde_json::to_string(&labeled_price).unwrap();

src/core/types/mask_position.rs

@@ -5,4 +5,3 @@ pub struct MaskPosition {
     pub y_shift: f64,
     pub scale: f64,
 }
-

src/core/types/mod.rs

@@ -10,12 +10,36 @@ pub use self::{
     chosen_inline_result::ChosenInlineResult,
     contact::Contact,
     document::Document,
+    file::File,
     force_reply::ForceReply,
     game::Game,
     inline_keyboard_button::{InlineKeyboardButton, InlineKeyboardButtonKind},
     inline_keyboard_markup::InlineKeyboardMarkup,
+    inline_query::InlineQuery,
+    inline_query_result::InlineQueryResult,
+    inline_query_result_article::InlineQueryResultArticle,
+    inline_query_result_audio::InlineQueryResultAudio,
+    inline_query_result_cached_audio::InlineQueryResultCachedAudio,
+    inline_query_result_cached_document::InlineQueryResultCachedDocument,
+    inline_query_result_cached_gif::InlineQueryResultCachedGif,
+    inline_query_result_cached_mpeg4_gif::InlineQueryResultCachedMpeg4Gif,
+    inline_query_result_cached_photo::InlineQueryResultCachedPhoto,
+    inline_query_result_cached_sticker::InlineQueryResultCachedSticker,
+    inline_query_result_cached_video::InlineQueryResultCachedVideo,
+    inline_query_result_cached_voice::InlineQueryResultCachedVoice,
+    inline_query_result_contact::InlineQueryResultContact,
+    inline_query_result_document::InlineQueryResultDocument,
+    inline_query_result_game::InlineQueryResultGame,
+    inline_query_result_gif::InlineQueryResultGif,
+    inline_query_result_location::InlineQueryResultLocation,
+    inline_query_result_mpeg4_gif::InlineQueryResultMpeg4Gif,
+    inline_query_result_photo::InlineQueryResultPhoto,
+    inline_query_result_venue::InlineQueryResultVenue,
+    inline_query_result_video::InlineQueryResultVideo,
+    inline_query_result_voice::InlineQueryResultVoice,
     input_file::InputFile,
     input_media::InputMedia,
+    input_message_content::InputMessageContent,
     invoice::Invoice,
     keyboard_button::KeyboardButton,
     label_price::LabeledPrice,
@@ -46,31 +70,6 @@ pub use self::{
     video::Video,
     video_note::VideoNote,
     voice::Voice,
-    file::File,
-    input_message_content::InputMessageContent,
-
-    inline_query::InlineQuery,
-    inline_query_result::InlineQueryResult,
-    inline_query_result_cached_audio::InlineQueryResultCachedAudio,
-    inline_query_result_cached_document::InlineQueryResultCachedDocument,
-    inline_query_result_cached_gif::InlineQueryResultCachedGif,
-    inline_query_result_cached_mpeg4_gif::InlineQueryResultCachedMpeg4Gif,
-    inline_query_result_cached_photo::InlineQueryResultCachedPhoto,
-    inline_query_result_cached_sticker::InlineQueryResultCachedSticker,
-    inline_query_result_cached_video::InlineQueryResultCachedVideo,
-    inline_query_result_cached_voice::InlineQueryResultCachedVoice,
-    inline_query_result_article::InlineQueryResultArticle,
-    inline_query_result_audio::InlineQueryResultAudio,
-    inline_query_result_contact::InlineQueryResultContact,
-    inline_query_result_game::InlineQueryResultGame,
-    inline_query_result_document::InlineQueryResultDocument,
-    inline_query_result_gif::InlineQueryResultGif,
-    inline_query_result_location::InlineQueryResultLocation,
-    inline_query_result_mpeg4_gif::InlineQueryResultMpeg4Gif,
-    inline_query_result_photo::InlineQueryResultPhoto,
-    inline_query_result_venue::InlineQueryResultVenue,
-    inline_query_result_video::InlineQueryResultVideo,
-    inline_query_result_voice::InlineQueryResultVoice,
 };
 
 mod animation;
@@ -83,12 +82,14 @@ mod chat_photo;
 mod chosen_inline_result;
 mod contact;
 mod document;
+mod file;
 mod force_reply;
 mod game;
 mod inline_keyboard_button;
 mod inline_keyboard_markup;
 mod input_file;
 mod input_media;
+mod input_message_content;
 mod invoice;
 mod keyboard_button;
 mod label_price;
@@ -118,11 +119,11 @@ mod venue;
 mod video;
 mod video_note;
 mod voice;
-mod file;
-mod input_message_content;
 
 mod inline_query;
 mod inline_query_result;
+mod inline_query_result_article;
+mod inline_query_result_audio;
 mod inline_query_result_cached_audio;
 mod inline_query_result_cached_document;
 mod inline_query_result_cached_gif;
@@ -131,11 +132,9 @@ mod inline_query_result_cached_photo;
 mod inline_query_result_cached_sticker;
 mod inline_query_result_cached_video;
 mod inline_query_result_cached_voice;
-mod inline_query_result_article;
-mod inline_query_result_audio;
 mod inline_query_result_contact;
-mod inline_query_result_game;
 mod inline_query_result_document;
+mod inline_query_result_game;
 mod inline_query_result_gif;
 mod inline_query_result_location;
 mod inline_query_result_mpeg4_gif;

src/core/types/photo_size.rs

@@ -24,7 +24,7 @@ mod tests {
             file_id: "id".to_string(),
             width: 320,
             height: 320,
-            file_size: Some(3452)
+            file_size: Some(3452),
         };
         let actual = serde_json::from_str::<PhotoSize>(json).unwrap();
         assert_eq!(actual, expected);

src/core/types/send_invoice.rs

@@ -1,5 +1,5 @@
-use crate::core::types::{InlineKeyboardMarkup, LabeledPrice};
 use crate::core::requests::ChatId;
+use crate::core::types::{InlineKeyboardMarkup, LabeledPrice};
 
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub struct SendInvoice {

src/core/types/shipping_option.rs

@@ -20,9 +20,10 @@ mod tests {
         let shipping_option = ShippingOption {
             id: "0".to_string(),
             title: "Option".to_string(),
-            prices: vec![
+            prices: vec![LabeledPrice {
-                LabeledPrice { label: "Label".to_string(), amount: 60 }
+                label: "Label".to_string(),
-            ]
+                amount: 60,
+            }],
         };
         let expected = r#"{"id":"0","title":"Option","prices":[{"label":"Label","amount":60}]}"#;
         let actual = serde_json::to_string(&shipping_option).unwrap();

src/core/types/update.rs

@@ -1,6 +1,4 @@
-use crate::core::types::{
+use crate::core::types::{CallbackQuery, ChosenInlineResult, Message};
-    Message, ChosenInlineResult, CallbackQuery,
-};
 
 #[derive(Debug, Deserialize, PartialEq, Clone)]
 pub struct Update {

src/core/types/venue.rs

@@ -1,6 +1,5 @@
 use crate::core::types::Location;
 
-
 /// This object represents a venue.
 #[derive(Debug, Deserialize, PartialEq, Serialize, Clone)]
 pub struct Venue {
@@ -13,7 +12,9 @@ pub struct Venue {
     /// Foursquare identifier of the venue
     #[serde(skip_serializing_if = "Option::is_none")]
     pub foursquare_id: Option<String>,
-    /// Foursquare type of the venue. (For example, “arts_entertainment/default”, “arts_entertainment/aquarium” or “food/icecream”.)
+    /// Foursquare type of the venue. (For example,
+    /// “arts_entertainment/default”, “arts_entertainment/aquarium” or
+    /// “food/icecream”.)
     #[serde(skip_serializing_if = "Option::is_none")]
     pub foursquare_type: Option<String>, // TODO: is this enum?...
 }

src/core/types/video_note.rs

@@ -1,5 +1,5 @@
-use serde::Deserialize;
 use crate::core::types::PhotoSize;
+use serde::Deserialize;
 
 #[derive(Debug, Deserialize, Clone, PartialEq, Eq, Hash)]
 /// This object represents a [video message](https://telegram.org/blog/video-messages-and-telescope)
@@ -7,7 +7,8 @@ use crate::core::types::PhotoSize;
 pub struct VideoNote {
     /// Identifier for this file
     pub file_id: String,
-    /// Video width and height (diameter of the video message) as defined by sender
+    /// Video width and height (diameter of the video message) as defined by
+    /// sender
     pub length: u32,
     /// Duration of the video in seconds as defined by sender
     pub duration: u32,