fix: deprcated warnings

Author: clearloop

Cargo.toml

@@ -4,8 +4,8 @@ path = "src/bin/lc.rs"
 
 [package]
 name = "leetcode-cli"
-version = "0.2.14"
-authors = ["clearloop <udtrokia@163.com>"]
+version = "0.2.15"
+authors = ["clearloop <cdr.today@foxmail.com>"]
 edition = "2018"
 description = "Leet your code in command-line."
 repository = "https://github.com/clearloop/leetcode-cli"

README.md

@@ -5,8 +5,8 @@
 [![LICENSE](https://img.shields.io/crates/l/leetcode-cli.svg)](https://choosealicense.com/licenses/mit/)
 
 ## Contributors
-+ [@Raees678](https://github.com/Raees678)
 + [@ldm0](https://github.com/ldm0)
++ [@Raees678](https://github.com/Raees678)
 + [@clearloop](https://github.com/clearloop)
 
 ## Features
@@ -27,8 +27,7 @@ cargo install leetcode-cli
 **Please make sure you have logined in `leetcode.com` with `chrome`**, more info plz checkout [this](#cookies)
 
 ```sh
-leetcode 0.2.14
-clearloop <udtrokia@163.com>
+leetcode 0.2.15
 May the Code be with You 👻
 
 USAGE:

SUBSTRATE.md

@@ -0,0 +1,47 @@
+# Pluging Substrate to leetcode-cli
+
+Fired by decentralize system and POS consensus, I just got a plan of great daring, **it would be nice** pluging a blockchain into leetcode-cli, for fun!
+
+### What can `blockchain` offer for leetcode-cli?
+
+The direct scene is the interaction of `leetcode-cli` users, **friends can make some secret contests themselves**, for example, Alice and Bob arrange that they will keep coding in next week, and the winner is the folk who solves more problems(no loser no game, no winner no life), how to implement this with blockchain system?
+
+1. Both of them stake part of their treasury into `leetcode-cli`'s blockchain treasury pool before the contest begin.
+2. At the deadline date, loser's treasury in pool will fly to the winners' wallet, unfortunately, the result will record in `leetcode-cli`'s blockchain system as well, if Bob lose, he lost really, besides, `leetcode-cli` will help him remember this.
+
+It's quite fun in some way, student times, friendships, coding memories...**Do you remember the Saturday Gigs?**
+
+
+## How to make this come true?
+
+Just joined a [substrate][ss] project last days, it is possible pluging `substrate` into `leetcode-cli`, eha, well, no questions, **just do it!**
+
+## Instructions
+
+Here are some instructions waiting to serve you, if you want to join this **lonely heart club** barehanded.
+
+**Q1: What is blockchain?**
+
+A blockchain is a chain of blocks.
+
+Well done, we just grasp the subtlety of the ultimate meaning of life, universe, and everything —— a towel and a guide-book is all we need.
+
+## Serious FAQ
+
+404.
+
+## Milestones
+
+> In progress.
+
+1. Construct the basic substrate in `leetcode-cli`'s repo as a side-project.
+2. Initialize treasuries which can never run out for everybody, yep, yet another digital world for Ricks and Morties.
+3. Abstract several contracts for different contest games.
+4. Complete the interation between `leetcode-cli` and `substrate`.
+
+## Contributes
+
+If you got some ideas about this march, or my poor English, just change this file, or comment below, any way, come as you are
+
+[ss]: https://substrate.dev/
+

src/cache/mod.rs

@@ -186,14 +186,20 @@ impl Cache {
         &self,
         run: Run,
         rfid: i32,
-        testcase: Option<String>
+        testcase: Option<String>,
     ) -> Result<(HashMap<&'static str, String>, [String; 2]), Error> {
         trace!("pre run code...");
         use crate::helper::code_path;
         use std::fs::File;
         use std::io::Read;
 
         let p = &self.get_problem(rfid)?;
+        if p.desc.is_empty() {
+            trace!("Problem description does not exist, pull desc and exec again...");
+            self.get_question(rfid)?;
+            return self.pre_run_code(run, rfid, testcase);
+        }
+
         let d: Question = serde_json::from_str(&p.desc)?;
         let conf = &self.0.conf;
         let mut json: HashMap<&'static str, String> = HashMap::new();
@@ -210,8 +216,7 @@ impl Cache {
         json.insert("name", p.name.to_string());
         match testcase {
             Some(case) => json.insert("data_input", case),
-            _ => json.insert("data_input", d.case)
-
+            _ => json.insert("data_input", d.case),
         };
 
         let url = match run {
@@ -257,7 +262,12 @@ impl Cache {
     }
 
     /// Exec problem filter —— Test or Submit
-    pub fn exec_problem(&self, rfid: i32, run: Run, testcase: Option<String>) -> Result<VerifyResult, Error> {
+    pub fn exec_problem(
+        &self,
+        rfid: i32,
+        run: Run,
+        testcase: Option<String>,
+    ) -> Result<VerifyResult, Error> {
         trace!("Exec problem filter —— Test or Submit");
         let pre = self.pre_run_code(run.clone(), rfid, testcase)?;
         let json = pre.0;

src/cli.rs

@@ -7,12 +7,11 @@ use crate::{
     err::Error,
     flag::{Debug, Flag},
 };
-use clap::{App, AppSettings, crate_name, crate_authors, crate_version};
+use clap::{crate_name, crate_version, App, AppSettings};
 
 /// Get maches
 pub fn main() -> Result<(), Error> {
     let m = App::new(crate_name!())
-        .author(crate_authors!("\n"))
         .version(crate_version!())
         .about("May the Code be with You 👻")
         .subcommands(vec![

src/err.rs

@@ -1,6 +1,5 @@
 //! Errors in leetcode-cli
 use colored::Colorize;
-use std::error::Error as StdError;
 use std::fmt;
 
 /// Error enum
@@ -48,29 +47,28 @@ impl std::fmt::Debug for Error {
 // network
 impl std::convert::From<reqwest::Error> for Error {
     fn from(err: reqwest::Error) -> Self {
-        Error::NetworkError(err.description().to_string())
+        Error::NetworkError(err.to_string())
     }
 }
 
 // nums
 impl std::convert::From<std::num::ParseIntError> for Error {
     fn from(err: std::num::ParseIntError) -> Self {
-        Error::ParseError(err.description().to_string())
+        Error::ParseError(err.to_string())
     }
 }
 
 // sql
 impl std::convert::From<diesel::result::Error> for Error {
     fn from(err: diesel::result::Error) -> Self {
-        Error::CacheError(err.description().to_string())
+        Error::CacheError(err.to_string())
     }
 }
 
 // serde
 impl std::convert::From<serde_json::error::Error> for Error {
     fn from(err: serde_json::Error) -> Self {
-        error!("{:?}", &err);
-        Error::ParseError(err.description().to_string())
+        Error::ParseError(err.to_string())
     }
 }
 
@@ -79,7 +77,7 @@ impl std::convert::From<toml::de::Error> for Error {
     fn from(err: toml::de::Error) -> Self {
         Error::ParseError(format!(
             "{}, {}{}{}{}{}{}{}{}",
-            err.description().to_string(),
+            err.to_string(),
             "Parse config file failed, ",
             "leetcode-cli has just generated a new leetcode.toml at ",
             "~/.leetcode/leetcode_tmp.toml,".green().bold().underline(),
@@ -94,14 +92,14 @@ impl std::convert::From<toml::de::Error> for Error {
 
 impl std::convert::From<toml::ser::Error> for Error {
     fn from(err: toml::ser::Error) -> Self {
-        Error::ParseError(err.description().to_string())
+        Error::ParseError(err.to_string())
     }
 }
 
 // io
 impl std::convert::From<std::io::Error> for Error {
     fn from(err: std::io::Error) -> Self {
-        Error::CacheError(err.description().to_string())
+        Error::CacheError(err.to_string())
     }
 }
 

src/lib.rs

@@ -23,8 +23,7 @@
 //! **Please make sure you have logined in `leetcode.com` with `chrome`**, more info plz checkout [this](#cookies)
 //!
 //! ```sh
-//! leetcode 0.2.14
-//! clearloop <udtrokia@163.com>
+//! leetcode 0.2.15
 //! May the Code be with You 👻
 //!
 //! USAGE: