diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-08-12 13:10:12 +0200 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-08-12 13:10:12 +0200 |
| commit | 042f2f04d5b0a6dc172610cf81276b9bb28e9456 (patch) | |
| tree | 85e3a0c857c94fa9e25fdc173e02679da44be659 | |
| parent | 9c8c76fcaeff5db429554474f6d12127bb880610 (diff) | |
| parent | 748b29580007745db05ffd5f8a470c2396df6890 (diff) | |
| download | mullvadvpn-042f2f04d5b0a6dc172610cf81276b9bb28e9456.tar.xz mullvadvpn-042f2f04d5b0a6dc172610cf81276b9bb28e9456.zip | |
Merge branch 'fix-nightly-rustc-warning'
| -rw-r--r-- | mullvad-exclude/src/main.rs | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/mullvad-exclude/src/main.rs b/mullvad-exclude/src/main.rs index bdcc19be84..ab72a9e7c0 100644 --- a/mullvad-exclude/src/main.rs +++ b/mullvad-exclude/src/main.rs @@ -49,25 +49,27 @@ enum Error { fn main() { #[cfg(target_os = "linux")] - match run() { - Err(Error::InvalidArguments) => { - let mut args = env::args(); - let program = args.next().unwrap_or_else(|| PROGRAM_NAME.to_string()); - eprintln!("Usage: {program} COMMAND [ARGS]"); - std::process::exit(1); - } - Err(e) => { - let mut s = format!("{e}"); - let mut source = e.source(); - while let Some(error) = source { - write!(&mut s, "\nCaused by: {error}").expect("formatting failed"); - source = error.source(); + // Drop the impossible case + if let Err(error) = run().map(drop) { + match error { + Error::InvalidArguments => { + let mut args = env::args(); + let program = args.next().unwrap_or_else(|| PROGRAM_NAME.to_string()); + eprintln!("Usage: {program} COMMAND [ARGS]"); + std::process::exit(1); } - eprintln!("{s}"); + e => { + let mut s = format!("{e}"); + let mut source = e.source(); + while let Some(error) = source { + write!(&mut s, "\nCaused by: {error}").expect("formatting failed"); + source = error.source(); + } + eprintln!("{s}"); - std::process::exit(1); + std::process::exit(1); + } } - _ => unreachable!("execv returned unexpectedly"), } } |
