Add ignore-result dependency

In some cases none of the variants of the Result type matter, so it's
best to just ignore them both. The ignore-result package provides the
means to ignore botth Result variants.

Author: nvinson

.gitignore

@@ -6,6 +6,7 @@ subprojects/bitflags-[0-9]*
 subprojects/clap-[0-9]*
 subprojects/clap_builder-[0-9]*
 subprojects/clap_lex-[0-9]*
+subprojects/ignore-result-[0-9]*
 subprojects/io-lifetimes-[0-9]*
 subprojects/itoa-[0-9]*
 subprojects/libc-[0-9]*

meson.build

@@ -17,14 +17,12 @@ if rustc.version().version_compare('<1.69')
 endif
 
 clap_rs_dep = dependency('clap-rs', version: '>=4.1.13')
+ignore_result_rs_dep = dependency('ignore-result-rs', version: '>=0.2.0')
 serde_rs_dep = dependency('serde-rs', version: '>=1.0.160')
 serde_json_rs_dep = dependency('serde_json-rs', version: '>=1.0.96')
 
 fqDataDir = get_option('prefix') / get_option('datadir') / 'refivar'
 
-lib_refivar_rs_sources = [
-]
-
 lib_refivar_guids_json = (
   meson.project_source_root() / 'src' / 'lib' / 'efivar' / 'guids.json'
 )
@@ -88,6 +86,7 @@ executable(
   link_with: lib_refivar,
   dependencies: [
     clap_rs_dep,
+    ignore_result_rs_dep,
     serde_rs_dep,
     serde_json_rs_dep
   ],

src/bin/efivar.rs

@@ -1,5 +1,7 @@
 use clap;
 use efivar::efi_guids;
+use ignore_result::Ignore;
+use std::io;
 use std::process::ExitCode;
 
 fn create_parser() -> clap::Command {
@@ -108,28 +110,24 @@ fn create_parser() -> clap::Command {
 }
 
 fn main() -> ExitCode {
-    let matches = create_parser().get_matches();
+    let mut parser = create_parser();
+    let matches = parser.get_matches_mut();
     if matches.get_flag("list-guids") {
         let mut guid_list: efi_guids::EfiGuidList = Default::default();
         match guid_list.load(matches.get_one("guids-list-path").unwrap()) {
             Ok(()) => {
                 for g in guid_list.guids(efi_guids::GuidListSortField::Guid) {
                     println!("{}", g);
                 }
-                println!("");
-                for g in guid_list.guids(efi_guids::GuidListSortField::Id) {
-                    println!("{}", g);
-                }
-                println!("");
-                for g in guid_list.guids(efi_guids::GuidListSortField::None) {
-                    println!("{}", g);
-                }
             }
             Err(e) => {
                 eprintln!("Failed to read GUIDs list file: {}", e);
                 return std::process::ExitCode::from(1);
             }
         }
+    } else {
+        parser.write_help(&mut io::stderr()).ignore();
+        return std::process::ExitCode::from(1);
     }
     return std::process::ExitCode::from(0);
 }

subprojects/ignore-result-rs.wrap

@@ -0,0 +1,10 @@
+[wrap-file]
+directory = ignore-result-0.2.0
+
+source_url = https://crates.io/api/v1/crates/ignore-result/0.2.0/download
+source_filename = ignore-result.tar.gz
+source_hash = 665ff4dce8edd10d490641ccb78949832f1ddbff02c584fb1f85ab888fe0e50c
+patch_directory = ignore-result-0.2.0
+
+[provide]
+ignore-result-rs = ignore_result_rs_dep

subprojects/packagefiles/ignore-result-0.2.0/meson.build

@@ -0,0 +1,27 @@
+project(
+  'ignore-result-rs',
+  'rust',
+  version: '0.2.0',
+  meson_version: '>=1.1.0',
+  default_options: [
+    'buildtype=debugoptimized',
+    'rust_std=2021'
+  ]
+)
+
+rustc = meson.get_compiler('rust')
+if rustc.version().version_compare('<1.69')
+  error('rustc 1.69 required. Found ' + rustc.version())
+endif
+
+lib_ignore_result = static_library('ignore_result', 'src/lib.rs',
+  rust_args: [],
+  rust_crate_type: 'rlib',
+  dependencies: [],
+  pic: true,
+)
+
+ignore_result_rs_dep = declare_dependency(
+  link_with: lib_ignore_result,
+  dependencies: []
+)