Begin unit testing effort

Begin unit testing effort. This required changes to much of the code to
make it easier to test. Some parts were also updated to try and improve
API consistency.

Author: nvinson

.gitignore

@@ -7,6 +7,7 @@ subprojects/clap-[0-9]*
 subprojects/clap_builder-[0-9]*
 subprojects/clap_lex-[0-9]*
 subprojects/ignore-result-[0-9]*
+subprojects/indoc-[0-9]*
 subprojects/io-lifetimes-[0-9]*
 subprojects/itoa-[0-9]*
 subprojects/libc-[0-9]*
@@ -21,3 +22,4 @@ subprojects/serde_json-[0-9]*
 subprojects/syn-[0-9]*
 subprojects/terminal_size-[0-9]*
 subprojects/unicode-ident-[0-9]*
+subprojects/unindent-[0-9]*

meson.build

@@ -2,7 +2,7 @@ project(
   'refivar',
   'rust',
   version: '0.1',
-  meson_version: '>= 1.1.0',
+  meson_version: '>= 1.2.0',
   default_options: [
     'warning_level=3',
     'rust_std=2021'
@@ -13,14 +13,15 @@ fs = import('fs')
 rust = import('rust')
 
 rustc = meson.get_compiler('rust')
-if rustc.version().version_compare('<1.69')
-  error('rustc 1.69 required. Found ' + rustc.version())
+if rustc.version().version_compare('<1.70')
+  error('rustc 1.70 required. Found ' + rustc.version())
 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')
+indoc_rs_dep = dependency('indoc-rs', version: '>=2.0.3')
 serde_json_rs_dep = dependency('serde_json-rs', version: '>=1.0.96')
+serde_rs_dep = dependency('serde-rs', version: '>=1.0.160')
 
 fqDataDir = get_option('prefix') / get_option('datadir') / 'refivar'
 
@@ -84,8 +85,9 @@ lib_refivar = static_library(
   ),
   rust_crate_type: 'lib',
   dependencies: [
+    indoc_rs_dep,
     serde_json_rs_dep,
-    serde_rs_dep
+    serde_rs_dep,
   ],
   install: false,
 )
@@ -102,10 +104,10 @@ executable(
   dependencies: [
     clap_rs_dep,
     ignore_result_rs_dep,
+    serde_json_rs_dep,
     serde_rs_dep,
-    serde_json_rs_dep
   ],
   install: true
 )
 
-rust.test('unit tests', lib_refivar)
+rust.test('unit tests', lib_refivar, rust_args:[])

src/bin/efivar.rs

@@ -112,7 +112,8 @@ fn create_parser() -> clap::Command {
 }
 
 fn list_variables(_parser_args: clap::ArgMatches) -> ExitCode {
-    let mut efivar_fs_variables: efivar::efivarfs::EfiVariables = Default::default();
+    let mut efivar_fs_variables: efivar::efivarfs::EfiVariables =
+        efivar::efivarfs::EfiVariables::new();
 
     match efivar_fs_variables.list() {
         Ok(variables) => {
@@ -122,7 +123,8 @@ fn list_variables(_parser_args: clap::ArgMatches) -> ExitCode {
             return std::process::ExitCode::from(0);
         }
         Err(_) => {
-            let efivar_variables: efivar::efivar::EfiVariables = Default::default();
+            let efivar_variables: efivar::efivar::EfiVariables =
+                efivar::efivar::EfiVariables::new();
             match efivar_variables.list() {
                 Ok(variables) => {
                     for v in variables {
@@ -142,7 +144,8 @@ fn list_variables(_parser_args: clap::ArgMatches) -> ExitCode {
 fn print_variable(parser_args: clap::ArgMatches, print_mode: efivar::types::PrintMode) -> ExitCode {
     match parser_args.get_one::<String>("name") {
         Some(name) => {
-            let efivar_fs_variables: efivar::efivarfs::EfiVariables = Default::default();
+            let efivar_fs_variables: efivar::efivarfs::EfiVariables =
+                efivar::efivarfs::EfiVariables::new();
             match efivar_fs_variables.get_variable(name) {
                 Ok(var) => {
                     match print_mode {
@@ -152,7 +155,8 @@ fn print_variable(parser_args: clap::ArgMatches, print_mode: efivar::types::Prin
                     return std::process::ExitCode::from(0);
                 }
                 Err(_) => {
-                    let efivar_variables: efivar::efivar::EfiVariables = Default::default();
+                    let efivar_variables: efivar::efivar::EfiVariables =
+                        efivar::efivar::EfiVariables::new();
                     match efivar_variables.get_variable(name) {
                         Ok(var) => {
                             match print_mode {

src/lib/efivar/efi_variable_attributes.rs

@@ -1,20 +1,20 @@
 use crate::types::EfiVariableAttribute;
 use std::collections::HashSet;
 
-pub static NON_VOLATILE: EfiVariableAttribute = EfiVariableAttribute::init("Non-Volatile", 0x1);
+pub static NON_VOLATILE: EfiVariableAttribute = EfiVariableAttribute::new("Non-Volatile", 0x1);
 pub static BOOTSERVICE_ACCESS: EfiVariableAttribute =
-    EfiVariableAttribute::init("Boot Service Access", 0x2);
+    EfiVariableAttribute::new("Boot Service Access", 0x2);
 pub static RUNTIME_ACCESS: EfiVariableAttribute =
-    EfiVariableAttribute::init("Runtime Service Access", 0x4);
+    EfiVariableAttribute::new("Runtime Service Access", 0x4);
 pub static HARDWARE_ERROR_RECORD: EfiVariableAttribute =
-    EfiVariableAttribute::init("Hardware Error Record", 0x8);
+    EfiVariableAttribute::new("Hardware Error Record", 0x8);
 pub static AUTHENTICATED_WRITE_ACCESS: EfiVariableAttribute =
-    EfiVariableAttribute::init("Authenticated Write Access", 0x10);
+    EfiVariableAttribute::new("Authenticated Write Access", 0x10);
 pub static TIME_BASED_AUTHENTICATED_WRITE_ACCESS: EfiVariableAttribute =
-    EfiVariableAttribute::init("Time-Based Authenticated Write Access", 0x20);
-pub static APPEND_WRITE: EfiVariableAttribute = EfiVariableAttribute::init("Append Write", 0x40);
+    EfiVariableAttribute::new("Time-Based Authenticated Write Access", 0x20);
+pub static APPEND_WRITE: EfiVariableAttribute = EfiVariableAttribute::new("Append Write", 0x40);
 pub static ENHANCED_AUTHENTICATED_ACCESS: EfiVariableAttribute =
-    EfiVariableAttribute::init("Enhanced Authenticated Access", 0x80);
+    EfiVariableAttribute::new("Enhanced Authenticated Access", 0x80);
 
 pub static EFI_VARIABLE_ATTRIBUTES: &'static [&EfiVariableAttribute] = &[
     &NON_VOLATILE,