chore: update to 2021 edition

Cargo.toml

@@ -6,11 +6,11 @@ description = """
 RnR is a command-line tool to rename multiple files and directories that
 supports regular expressions
 """
+edition = "2021"
 categories = ["command-line-utilities"]
 license = "MIT"
 homepage = "https://github.com/ismaelgv/rnr"
 repository = "https://github.com/ismaelgv/rnr"
-build = "build.rs"
 readme = "README.md"
 
 [dependencies]
@@ -28,5 +28,5 @@ difference = "^2.0.0"
 any_ascii = "^0.3.0"
 
 [build-dependencies]
-clap = "^4.0"
+clap = { version = "^4.0", features = ["derive"] }
 clap_complete = "^4.0"

src/cli.rs

@@ -1,3 +1,5 @@
+use clap::{Parser, Subcommand, ValueEnum};
+
 #[derive(Parser)]
 #[command(version, about, author)]
 pub struct Cli {
@@ -93,37 +95,3 @@ pub enum ReplaceTransform {
     Lower,
     ASCII,
 }
-
-/*
-    App::new(crate_name!())
-        .setting(AppSettings::SubcommandsNegateReqs)
-        .args(&common_args)
-        .args(&path_args)
-        .args(&replace_args)
-        .subcommand(
-            SubCommand::with_name(FROM_FILE_SUBCOMMAND)
-                .args(&common_args)
-                .arg(
-                    Arg::with_name("DUMPFILE")
-                        .takes_value(true)
-                        .required(true)
-                        .value_name("DUMPFILE")
-                        .validator_os(is_valid_string)
-                        .index(1),
-                )
-                .arg(
-                    Arg::with_name("undo")
-                        .long("undo")
-                        .short("u")
-                        .help("Undo the operations from the dump file"),
-                )
-                .about("Read operations from a dump file"),
-        )
-        .subcommand(
-            SubCommand::with_name(TO_ASCII_SUBCOMMAND)
-                .args(&common_args)
-                .args(&path_args)
-                .about("Replace file name UTF-8 chars with ASCII chars representation."),
-        )
-}
-*/

src/dumpfile.rs

@@ -1,4 +1,5 @@
 use chrono;
+use serde_derive::{Deserialize, Serialize};
 use crate::error::*;
 use serde_json;
 use crate::solver::{Operation, Operations};

src/main.rs

@@ -12,10 +12,7 @@ extern crate serde;
 extern crate serde_json;
 extern crate walkdir;
 
-#[macro_use]
 extern crate clap;
-
-#[macro_use]
 extern crate serde_derive;
 
 use crate::renamer::Renamer;

src/solver.rs

@@ -1,6 +1,7 @@
 use crate::error::*;
 use crate::fileutils::{is_same_file, PathList};
 use path_abs::PathAbs;
+use serde_derive::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::path::PathBuf;