refactor: rename into_x to wrap_x

Author: Thaumy

src/api/auth/session.rs

@@ -1,4 +1,4 @@
-use crate::infra::result::IntoResult;
+use crate::infra::result::WrapResult;
 use anyhow::{anyhow, Result};
 use home::home_dir;
 use std::fs;
@@ -10,18 +10,18 @@ fn remove_pat(path: &Path) -> Result<()> {
     if metadata(path).is_ok() {
         remove_file(path)?;
     }
-    ().into_ok()
+    ().wrap_ok()
 }
 
 fn save_pat(pat: &str, path: &Path) -> Result<()> {
     let mut file = File::create(path)?;
     file.write_all(pat.as_bytes())?;
-    ().into_ok()
+    ().wrap_ok()
 }
 
 fn get_cfg_path() -> Result<PathBuf> {
     let home = home_dir().ok_or_else(|| anyhow!("Can not get home dir"))?;
-    home.join(".cnbrc").into_ok()
+    home.join(".cnbrc").wrap_ok()
 }
 
 pub fn login(pat: &str) -> Result<PathBuf> {
@@ -31,7 +31,7 @@ pub fn login(pat: &str) -> Result<PathBuf> {
     remove_pat(cfg_path)?;
     save_pat(pat, cfg_path)?;
 
-    cfg_path.to_owned().into_ok()
+    cfg_path.to_owned().wrap_ok()
 }
 
 pub fn logout() -> Result<PathBuf> {
@@ -40,7 +40,7 @@ pub fn logout() -> Result<PathBuf> {
 
     remove_pat(cfg_path)?;
 
-    cfg_path.to_owned().into_ok()
+    cfg_path.to_owned().wrap_ok()
 }
 
 pub fn get_pat() -> Result<String> {

src/api/fav/get_list.rs

@@ -2,7 +2,7 @@ use crate::api::fav::Fav;
 use crate::infra::http::{body_or_err, RequestBuilderExt};
 use crate::infra::iter::IntoIteratorExt;
 use crate::infra::json;
-use crate::infra::result::IntoResult;
+use crate::infra::result::WrapResult;
 use crate::infra::vec::VecExt;
 use crate::openapi;
 use anyhow::Result;
@@ -42,7 +42,7 @@ impl Fav {
 
                 json::deserialize::<Vec<FavEntry>>(&body)?
                     .pop()
-                    .into_ok::<anyhow::Error>()
+                    .wrap_ok::<anyhow::Error>()
             })
             .join_all()
             .await

src/api/ing/get_comment_list.rs

@@ -1,7 +1,7 @@
 use crate::api::ing::Ing;
 use crate::infra::http::{body_or_err, RequestBuilderExt};
 use crate::infra::json;
-use crate::infra::result::IntoResult;
+use crate::infra::result::WrapResult;
 use crate::openapi;
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
@@ -43,6 +43,6 @@ impl Ing {
             json::deserialize::<Vec<IngCommentEntry>>(&body)?
         };
 
-        entry_vec.into_ok()
+        entry_vec.wrap_ok()
     }
 }

src/api/ing/get_list.rs

@@ -2,7 +2,7 @@ use crate::api::ing::{Ing, IngSendFrom, IngType};
 use crate::infra::http::{body_or_err, RequestBuilderExt};
 use crate::infra::iter::IntoIteratorExt;
 use crate::infra::json;
-use crate::infra::result::IntoResult;
+use crate::infra::result::WrapResult;
 use crate::infra::vec::VecExt;
 use crate::openapi;
 use anyhow::Result;
@@ -61,7 +61,7 @@ impl Ing {
 
                 let body = body_or_err(resp).await?;
 
-                json::deserialize::<Vec<IngEntry>>(&body)?.pop().into_ok()
+                json::deserialize::<Vec<IngEntry>>(&body)?.pop().wrap_ok()
             })
             .join_all()
             .await

src/api/news/get_list.rs

@@ -2,7 +2,7 @@ use crate::api::news::News;
 use crate::infra::http::{body_or_err, RequestBuilderExt};
 use crate::infra::iter::IntoIteratorExt;
 use crate::infra::json;
-use crate::infra::result::IntoResult;
+use crate::infra::result::WrapResult;
 use crate::openapi;
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
@@ -50,7 +50,7 @@ impl News {
                     entry
                 };
 
-                entry.into_ok::<anyhow::Error>()
+                entry.wrap_ok::<anyhow::Error>()
             })
             .join_all()
             .await

src/api/post/create.rs

@@ -2,7 +2,7 @@ use crate::api::post::Post;
 use crate::blog_backend;
 use crate::infra::http::{body_or_err, RequestBuilderExt};
 use crate::infra::json;
-use crate::infra::result::IntoResult;
+use crate::infra::result::WrapResult;
 use anyhow::Result;
 use serde_json::{json, Value};
 
@@ -30,6 +30,6 @@ impl Post {
             json["id"].as_u64().expect("as_u64 failed for `id`") as usize
         };
 
-        id.into_ok()
+        id.wrap_ok()
     }
 }

src/api/post/get_comment_list.rs

@@ -2,7 +2,7 @@ use crate::api::post::Post;
 use crate::api::user::User;
 use crate::infra::http::{body_or_err, RequestBuilderExt};
 use crate::infra::json;
-use crate::infra::result::IntoResult;
+use crate::infra::result::WrapResult;
 use crate::openapi;
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
@@ -41,6 +41,6 @@ impl Post {
             json::deserialize::<Vec<PostCommentEntry>>(&body)?
         };
 
-        entry_vec.into_ok()
+        entry_vec.wrap_ok()
     }
 }

src/api/post/get_count.rs

@@ -2,7 +2,7 @@ use crate::api::post::Post;
 use crate::blog_backend;
 use crate::infra::http::{body_or_err, RequestBuilderExt};
 use crate::infra::json;
-use crate::infra::result::IntoResult;
+use crate::infra::result::WrapResult;
 use anyhow::Result;
 use serde_json::Value;
 
@@ -26,6 +26,6 @@ impl Post {
                 .expect("as_u64 failed for `postsCount`") as usize
         };
 
-        count.into_ok()
+        count.wrap_ok()
     }
 }

src/api/post/get_meta_list.rs

@@ -4,7 +4,7 @@ use crate::blog_backend;
 use crate::infra::http::{body_or_err, RequestBuilderExt};
 use crate::infra::iter::IntoIteratorExt;
 use crate::infra::json;
-use crate::infra::result::IntoResult;
+use crate::infra::result::WrapResult;
 use anyhow::Result;
 use serde_json::Value;
 
@@ -50,13 +50,13 @@ impl Post {
                     entry
                 };
 
-                entry.into_ok()
+                entry.wrap_ok()
             })
             .join_all()
             .await
             .into_iter()
             .collect::<Result<Vec<_>>>();
 
-        (vec?, total_count).into_ok()
+        (vec?, total_count).wrap_ok()
     }
 }

src/api/post/get_one.rs

@@ -2,7 +2,7 @@ use crate::api::post::Post;
 use crate::blog_backend;
 use crate::infra::http::{body_or_err, RequestBuilderExt};
 use crate::infra::json;
-use crate::infra::result::IntoResult;
+use crate::infra::result::WrapResult;
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -53,6 +53,6 @@ impl Post {
             serde_json::from_value::<PostEntry>(json)?
         };
 
-        entry.into_ok()
+        entry.wrap_ok()
     }
 }