RustPython
diff --git a/‎Cargo.lock
Copy file name to clipboardExpand all lines: Cargo.lock
+30-25Lines changed: 30 additions & 25 deletions b/‎Cargo.lock
Copy file name to clipboardExpand all lines: Cargo.lock
+30-25Lines changed: 30 additions & 25 deletions
diff --git a/‎Cargo.toml
Copy file name to clipboardExpand all lines: Cargo.toml
+1-1Lines changed: 1 addition & 1 deletion b/‎Cargo.toml
Copy file name to clipboardExpand all lines: Cargo.toml
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎examples/dis.rs
Copy file name to clipboardExpand all lines: examples/dis.rs
+18-19Lines changed: 18 additions & 19 deletions b/‎examples/dis.rs
Copy file name to clipboardExpand all lines: examples/dis.rs
+18-19Lines changed: 18 additions & 19 deletions
diff --git a/‎examples/parse_folder.rs
Copy file name to clipboardExpand all lines: examples/parse_folder.rs
+9-14Lines changed: 9 additions & 14 deletions b/‎examples/parse_folder.rs
Copy file name to clipboardExpand all lines: examples/parse_folder.rs
+9-14Lines changed: 9 additions & 14 deletions
@@ -33,7 +33,7 @@ ssl-vendor = ["rustpython-stdlib/ssl-vendor"]
 [dependencies]
 log = "0.4"
 env_logger = { version = "0.9.0", default-features = false, features = ["atty", "termcolor"] }
-clap = "2.33"
+clap = "3"
 rustpython-compiler = { path = "compiler/porcelain", version = "0.1.1" }
 rustpython-parser = { path = "parser", version = "0.1.1" }
 rustpython-vm = { path = "vm", version = "0.1.1", default-features = false, features = ["compile-parse"] }
 
@@ -1,12 +1,11 @@
-/// This an example usage of the rustpython_compiler crate.
-/// This program reads, parses, and compiles a file you provide
-/// to RustPython bytecode, and then displays the output in the
-/// `dis.dis` format.
-///
-/// example usage:
-/// $ cargo run --release --example dis demo*.py
+//! This an example usage of the rustpython_compiler crate.
+//! This program reads, parses, and compiles a file you provide
+//! to RustPython bytecode, and then displays the output in the
+//! `dis.dis` format.
+//!
+//! example usage:
+//! $ cargo run --release --example dis demo*.py
 
-#[macro_use]
 extern crate clap;
 extern crate env_logger;
 #[macro_use]
@@ -22,38 +21,38 @@ use std::path::Path;
 fn main() {
     env_logger::init();
     let app = App::new("dis")
-        .version(crate_version!())
-        .author(crate_authors!())
+        .version(env!("CARGO_PKG_VERSION"))
+        .author(env!("CARGO_PKG_AUTHORS"))
         .about("Compiles and disassembles python script files for viewing their bytecode.")
         .arg(
-            Arg::with_name("scripts")
+            Arg::new("scripts")
                 .help("Scripts to scan")
-                .multiple(true)
+                .multiple_values(true)
                 .required(true),
         )
         .arg(
-            Arg::with_name("mode")
+            Arg::new("mode")
                 .help("The mode to compile the scripts in")
                 .long("mode")
-                .short("m")
+                .short('m')
                 .default_value("exec")
                 .possible_values(&["exec", "single", "eval"])
                 .takes_value(true),
         )
         .arg(
-            Arg::with_name("no_expand")
+            Arg::new("no_expand")
                 .help(
                     "Don't expand CodeObject LoadConst instructions to show \
                      the instructions inside",
                 )
                 .long("no-expand")
-                .short("x"),
+                .short('x'),
         )
         .arg(
-            Arg::with_name("optimize")
+            Arg::new("optimize")
                 .help("The amount of optimization to apply to the compiled bytecode")
-                .short("O")
-                .multiple(true),
+                .short('O')
+                .multiple_occurrences(true),
         );
     let matches = app.get_matches();
 
 
@@ -1,11 +1,10 @@
-/// This an example usage of the rustpython_parser crate.
-/// This program crawls over a directory of python files and
-/// tries to parse them into an abstract syntax tree (AST)
-///
-/// example usage:
-/// $ RUST_LOG=info cargo run --release parse_folder /usr/lib/python3.7
+//! This an example usage of the rustpython_parser crate.
+//! This program crawls over a directory of python files and
+//! tries to parse them into an abstract syntax tree (AST)
+//!
+//! example usage:
+//! $ RUST_LOG=info cargo run --release parse_folder /usr/lib/python3.7
 
-#[macro_use]
 extern crate clap;
 extern crate env_logger;
 #[macro_use]
@@ -20,14 +19,10 @@ use std::time::{Duration, Instant};
 fn main() {
     env_logger::init();
     let app = App::new("parse_folders")
-        .version(crate_version!())
-        .author(crate_authors!())
+        .version(env!("CARGO_PKG_VERSION"))
+        .author(env!("CARGO_PKG_AUTHORS"))
         .about("Walks over all .py files in a folder, and parses them.")
-        .arg(
-            Arg::with_name("folder")
-                .help("Folder to scan")
-                .required(true),
-        );
+        .arg(Arg::new("folder").help("Folder to scan").required(true));
     let matches = app.get_matches();
 
     let folder = Path::new(matches.value_of("folder").unwrap());