Fixed problems with borrow checker in core/requests

src/core/requests/form_builder.rs

@@ -32,16 +32,14 @@ impl FormBuilder {
     where
         T: Serialize,
     {
-        Self {
+        match value {
-            form: value.map_or_else(
+            None => Self { form: self.form },
-                || self.form,
+            Some(value) => Self {
-                |value| {
+                form: self.form.text(
-                    self.form.text(
                     name.to_owned(),
                     serde_json::to_string(value).expect("serde_json::to_string failed"),
                 )
-                },
+            }
-            ),
         }
     }
 

src/core/requests/get_me.rs

@@ -18,7 +18,7 @@ impl Request for GetMe {
     type ReturnValue = User;
 
     fn send(self) -> RequestFuture<ResponseResult<Self::ReturnValue>> {
-        Box::new(async {
+        Box::new(async move {
             request(&self.info.client, &self.info.token, "getMe", None).await
         })
     }

src/core/requests/mod.rs

@@ -22,9 +22,9 @@ pub type RequestFuture<T> = Box<dyn Future<Output = T>>;
 
 // todo: better name?
 #[derive(Debug)]
-pub(crate) struct RequestInfo {
+pub struct RequestInfo {
-    pub(crate) client: Client,
+    pub client: Client,
-    pub(crate) token: String,
+    pub token: String,
 }
 
 /// Unique identifier for the target chat or username of the target channel (in

src/core/requests/send_message.rs

@@ -37,7 +37,7 @@ impl Request for SendMessage {
 
 
     fn send(self) -> RequestFuture<ResponseResult<Self::ReturnValue>> {
-        Box::new(async {
+        Box::new(async move {
             let params = FormBuilder::new()
                 .add("chat_id", &self.chat_id)
                 .add("text", &self.text)

src/core/types/message_entity.rs

@@ -12,15 +12,15 @@ pub struct MessageEntity {
 #[derive(Deserialize, Debug, PartialEq, Hash, Eq)]
 #[serde(rename_all = "snake_case")]
 #[serde(tag = "type")]
-enum MessageEntityKind {
+pub enum MessageEntityKind {
     Mention, Hashtag, Cashtag, BotCommand, Url, Email, PhoneNumber,
     Bold, Italic, Code, Pre,
     TextLink { url: String },
     TextMention { user: User }
 }
 
-#[cfg(test)]
+#[test]
-fn test() {
+fn recursive_kind() {
     use serde_json::from_str;
 
     assert_eq!(

src/lib.rs

@@ -1,5 +1,3 @@
-#![feature(async_await)]
-
 #[macro_use]
 extern crate derive_more;
 #[macro_use]