RustPython
diff --git a/‎Cargo.lock
Copy file name to clipboardExpand all lines: Cargo.lock
+7-26Lines changed: 7 additions & 26 deletions b/‎Cargo.lock
Copy file name to clipboardExpand all lines: Cargo.lock
+7-26Lines changed: 7 additions & 26 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/‎Lib/test/test_cmd_line.py
Copy file name to clipboardExpand all lines: Lib/test/test_cmd_line.py
-8Lines changed: 0 additions & 8 deletions b/‎Lib/test/test_cmd_line.py
Copy file name to clipboardExpand all lines: Lib/test/test_cmd_line.py
-8Lines changed: 0 additions & 8 deletions
diff --git a/‎src/lib.rs
Copy file name to clipboardExpand all lines: src/lib.rs
+7-4Lines changed: 7 additions & 4 deletions b/‎src/lib.rs
Copy file name to clipboardExpand all lines: src/lib.rs
+7-4Lines changed: 7 additions & 4 deletions
@@ -34,7 +34,7 @@ cfg-if = { workspace = true }
 log = { workspace = true }
 flame = { workspace = true, optional = true }
 
-clap = "2.34"
+lexopt = "0.3"
 dirs = { package = "dirs-next", version = "2.0.0" }
 env_logger = { version = "0.9.0", default-features = false, features = ["atty", "termcolor"] }
 flamescope = { version = "0.1.2", optional = true }
 
@@ -38,8 +38,6 @@ def verify_valid_flag(self, cmd_line):
         self.assertNotIn(b'Traceback', err)
         return out
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_help(self):
         self.verify_valid_flag('-h')
         self.verify_valid_flag('-?')
@@ -82,8 +80,6 @@ def test_optimize(self):
     def test_site_flag(self):
         self.verify_valid_flag('-S')
 
-    # NOTE: RUSTPYTHON version never starts with Python
-    @unittest.expectedFailure
     def test_version(self):
         version = ('Python %d.%d' % sys.version_info[:2]).encode("ascii")
         for switch in '-V', '--version', '-VV':
@@ -550,8 +546,6 @@ def test_no_stderr(self):
     def test_no_std_streams(self):
         self._test_no_stdio(['stdin', 'stdout', 'stderr'])
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_hash_randomization(self):
         # Verify that -R enables hash randomization:
         self.verify_valid_flag('-R')
@@ -966,8 +960,6 @@ def test_ignore_PYTHONPATH(self):
         self.run_ignoring_vars("'{}' not in sys.path".format(path),
                                PYTHONPATH=path)
 
-    # TODO: RUSTPYTHON
-    @unittest.expectedFailure
     def test_ignore_PYTHONHASHSEED(self):
         self.run_ignoring_vars("sys.flags.hash_randomization == 1",
                                PYTHONHASHSEED="0")
 
@@ -37,9 +37,6 @@
 //! it will have your modules loaded into the vm.
 #![allow(clippy::needless_doctest_main)]
 
-#[macro_use]
-extern crate clap;
-extern crate env_logger;
 #[macro_use]
 extern crate log;
 
@@ -73,7 +70,13 @@ pub fn run(init: impl FnOnce(&mut VirtualMachine) + 'static) -> ExitCode {
         };
     }
 
-    let (settings, run_mode) = opts_with_clap();
+    let (settings, run_mode) = match opts_with_clap() {
+        Ok(x) => x,
+        Err(e) => {
+            println!("{e}");
+            return ExitCode::FAILURE;
+        }
+    };
 
     // don't translate newlines (\r\n <=> \n)
     #[cfg(windows)]