Fix breaking changes

Author: valeriansaliou

src/main.rs

@@ -7,8 +7,6 @@
 #[macro_use]
 extern crate log;
 #[macro_use]
-extern crate clap;
-#[macro_use]
 extern crate lazy_static;
 #[macro_use]
 extern crate serde_derive;
@@ -29,7 +27,7 @@ use std::str::FromStr;
 use std::thread;
 use std::time::Duration;
 
-use clap::{App, Arg};
+use clap::{Arg, Command};
 use log::LevelFilter;
 
 use config::config::Config;
@@ -49,23 +47,25 @@ lazy_static! {
 }
 
 fn make_app_args() -> AppArgs {
-    let matches = App::new(crate_name!())
-        .version(crate_version!())
-        .author(crate_authors!("\n"))
-        .about(crate_description!())
+    let matches = Command::new(clap::crate_name!())
+        .version(clap::crate_version!())
+        .author(clap::crate_authors!())
+        .about(clap::crate_description!())
         .arg(
             Arg::new("config")
                 .short('c')
                 .long("config")
                 .help("Path to configuration file")
-                .default_value("./config.cfg")
-                .takes_value(true),
+                .default_value("./config.cfg"),
         )
         .get_matches();
 
     // Generate owned app arguments
     AppArgs {
-        config: String::from(matches.value_of("config").expect("invalid config value")),
+        config: matches
+            .get_one::<String>("config")
+            .expect("invalid config value")
+            .to_owned(),
     }
 }
 

src/probe/report.rs

@@ -4,7 +4,8 @@
 // Copyright: 2018, Crisp IM SAS
 // License: Mozilla Public License v2.0 (MPL v2.0)
 
-use base64;
+use base64::engine::general_purpose::STANDARD as base64_encoder;
+use base64::Engine;
 use http_req::{
     request::{Method, Request},
     uri::Uri,
@@ -39,7 +40,7 @@ lazy_static! {
         format!("{}/{}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"));
     pub static ref REPORT_HTTP_HEADER_AUTHORIZATION: String = format!(
         "Basic {}",
-        base64::encode(&format!(":{}", APP_CONF.report.token))
+        base64_encoder.encode(&format!(":{}", APP_CONF.report.token))
     );
 }