Update cargo handling

subprojects/ignore-result--rs.wrap works around a name resolution bug in
meson-1.6.1.

Signed-off-by: Nicholas Vinson <nvinson234@gmail.com>

Author: nvinson

.gitignore

@@ -1,25 +1,5 @@
 build
 subprojects/packagecache
 
-subprojects/anstyle-[0-9]*
-subprojects/bitflags-[0-9]*
-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]*
-subprojects/linux-raw-sys-[0-9]*
-subprojects/proc-macro2-[0-9]*
-subprojects/quote-[0-9]*
-subprojects/rustix-[0-9]*
-subprojects/ryu-[0-9]*
-subprojects/serde-[0-9]*
-subprojects/serde_derive-[0-9]*
-subprojects/serde_json-[0-9]*
-subprojects/syn-[0-9]*
-subprojects/terminal_size-[0-9]*
-subprojects/unicode-ident-[0-9]*
-subprojects/unindent-[0-9]*
+subprojects/*
+!subprojects/*.wrap

meson.build

@@ -2,11 +2,11 @@ project(
   'refivar',
   'rust',
   version: '0.1',
-  meson_version: '>= 1.2.0',
-  default_options: [
-    'warning_level=3',
-    'rust_std=2021'
-  ]
+  meson_version: '>= 1.4.0',
+  default_options: {
+    'warning_level': '3',
+    'rust_std': '2021'
+  }
 )
 
 fs = import('fs')
@@ -17,11 +17,11 @@ 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')
-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')
+clap_rs_dep = dependency('clap-4-rs', version: '>=4.5.8')
+ignore_result_rs_dep = dependency('ignore-result-0.2-rs', version: '>=0.2.0')
+indoc_rs_dep = dependency('indoc-2-rs', version: '>=2.0.5')
+serde_json_rs_dep = dependency('serde_json-1-rs', version: '>=1.0.119')
+serde_rs_dep = dependency('serde-1-rs', version: '>=1.0.203')
 
 fqDataDir = get_option('prefix') / get_option('datadir') / 'refivar'
 
@@ -83,7 +83,7 @@ lib_refivar = static_library(
       ],
     }
   ),
-  rust_crate_type: 'lib',
+  rust_abi: 'rust',
   dependencies: [
     indoc_rs_dep,
     serde_json_rs_dep,

src/lib/efivar/efi_guids.rs

@@ -1,7 +1,6 @@
 use crate::efi_guids_list_path;
 use crate::types::EfiGuid;
 use crate::types::EfiGuidListEntry;
-use serde::Deserialize;
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::{BufReader, Error};
@@ -18,13 +17,6 @@ pub struct EfiGuidList {
     guids_map: Option<HashMap<String, EfiGuidListEntry>>,
 }
 
-#[derive(Deserialize)]
-struct JsonEfiGuidListEntry {
-    name: String,
-    description: String,
-    guid: String,
-}
-
 impl Default for EfiGuidList {
     fn default() -> Self {
         Self::new()
@@ -39,25 +31,18 @@ impl EfiGuidList {
     pub fn load(&mut self, path: &String) -> Result<(), Error> {
         let mut map: HashMap<String, EfiGuidListEntry> = HashMap::new();
         let reader = BufReader::new(File::open(path)?);
-        let result: serde_json::Result<Vec<JsonEfiGuidListEntry>> = serde_json::from_reader(reader);
+        let result: serde_json::Result<Vec<EfiGuidListEntry>> = serde_json::from_reader(reader);
         match result {
             Ok(v) => {
                 for entry in v {
-                    match entry.guid.parse::<EfiGuid>() {
-                        Ok(g) => {
-                            map.insert(
-                                entry.name.clone(),
-                                EfiGuidListEntry {
-                                    guid: g,
-                                    name: entry.name.clone(),
-                                    description: entry.description,
-                                },
-                            );
-                        }
-                        Err(_) => {
-                            eprintln!("Entry with UUID: {} invalid. Skipping...", entry.guid);
-                        }
-                    };
+                    map.insert(
+                        entry.name.clone(),
+                        EfiGuidListEntry {
+                            guid: entry.guid,
+                            name: entry.name.clone(),
+                            description: entry.description,
+                        },
+                    );
                 }
             }
             Err(e) => return Err(e.into()),

src/lib/efivar/types/efi_guid_list_entry.rs

@@ -1,4 +1,5 @@
 use crate::types::efi_guid::EfiGuid;
+use serde::de::{Deserialize};
 use std::fmt;
 
 #[derive(PartialEq)]
@@ -8,6 +9,15 @@ pub struct EfiGuidListEntry {
     pub description: String,
 }
 
+impl<'de> Deserialize<'de> for EfiGuidListEntry {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        todo!()
+    }
+}
+
 impl fmt::Display for EfiGuidListEntry {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(

subprojects/anstyle-rs.wrap

@@ -1,10 +1,9 @@
 [wrap-file]
-directory = clap-4.3.0
-
-source_url = https://crates.io/api/v1/crates/clap/4.3.0/download
-source_filename = clap-4.3.0.tar.gz
-source_hash = 93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc
-patch_directory = clap-4.3.0
+directory = clap-4.5.8
+source_url = https://crates.io/api/v1/crates/clap/4.5.8/download
+source_filename = clap-4.5.8.tar.gz
+source_hash = 84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d
+method = cargo
 
 [provide]
-clap-rs = clap_rs_dep
+dependency_names = clap-4-rs

subprojects/bitflags-rs.wrap

@@ -2,9 +2,9 @@
 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_filename = ignore-result-0.2.tar.gz
 source_hash = 665ff4dce8edd10d490641ccb78949832f1ddbff02c584fb1f85ab888fe0e50c
-patch_directory = ignore-result-0.2.0
+method = cargo
 
 [provide]
-ignore-result-rs = ignore_result_rs_dep
+dependency_names = ignore-result-0.2-rs