migrate to rust 2021

the only changes are prefixing
unread fields in rust structs
with _

Author: ganthern

Cargo.toml

@@ -2,7 +2,7 @@
 name = "mapirs"
 version = "0.3.0"
 authors = ["nig <nig@tutao.de>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
 # dynamically linked c library (a dll)

src/structs/file_descriptor.rs

@@ -26,8 +26,8 @@ pub struct RawMapiFileTagExt {
 
 #[derive(Debug)]
 pub struct FileTagExtension {
-    tag: Vec<u8>,
-    encoding: Vec<u8>,
+    _tag: Vec<u8>,
+    _encoding: Vec<u8>,
 }
 
 impl TryFrom<*const RawMapiFileTagExt> for FileTagExtension {
@@ -53,8 +53,8 @@ impl TryFrom<*const RawMapiFileTagExt> for FileTagExtension {
             */
             let raw = unsafe { &*raw_ptr };
             Ok(FileTagExtension {
-                tag: conversion::copy_c_array_to_vec(raw.lp_tag, raw.cb_tag as usize),
-                encoding: conversion::copy_c_array_to_vec(
+                _tag: conversion::copy_c_array_to_vec(raw.lp_tag, raw.cb_tag as usize),
+                _encoding: conversion::copy_c_array_to_vec(
                     raw.lp_encoding,
                     raw.cb_encoding as usize,
                 ),
@@ -82,13 +82,13 @@ pub struct RawMapiFileDesc {
 
 #[derive(Debug)]
 pub struct FileDescriptor {
-    flags: MapiFileFlags,
-    position: ULong,
+    _flags: MapiFileFlags,
+    _position: ULong,
     /// absolute path to attachment
     pub path_name: FilePath,
     /// file name to use for the attachment (if different from the name in the path)
     pub file_name: Option<PathBuf>,
-    file_type: Option<FileTagExtension>,
+    _file_type: Option<FileTagExtension>,
 }
 
 impl TryFrom<&RawMapiFileDesc> for FileDescriptor {
@@ -100,11 +100,11 @@ impl TryFrom<&RawMapiFileDesc> for FileDescriptor {
         {
             let file_path: FilePath = FilePath::try_from(file_path)?;
             Ok(FileDescriptor {
-                flags: raw.flags,
-                position: raw.position,
+                _flags: raw.flags,
+                _position: raw.position,
                 path_name: file_path,
                 file_name: conversion::maybe_string_from_raw_ptr(raw.file_name).map(PathBuf::from),
-                file_type: FileTagExtension::try_from(raw.file_type).ok(),
+                _file_type: FileTagExtension::try_from(raw.file_type).ok(),
             })
         } else {
             Err(())
@@ -115,11 +115,11 @@ impl TryFrom<&RawMapiFileDesc> for FileDescriptor {
 impl FileDescriptor {
     pub fn new(file_path: &str, file_name: Option<&str>) -> Self {
         Self {
-            flags: MapiFileFlags::empty(),
-            position: 0,
+            _flags: MapiFileFlags::empty(),
+            _position: 0,
             path_name: FilePath::try_from(PathBuf::from(file_path)).unwrap(),
             file_name: file_name.map(PathBuf::from),
-            file_type: None,
+            _file_type: None,
         }
     }
 

src/structs/message.rs

@@ -44,11 +44,11 @@ pub struct RawMapiMessage {
 pub struct Message {
     subject: Option<String>,
     note_text: Option<String>,
-    message_type: Option<String>,
-    date_received: Option<String>,
-    conversation_id: Option<String>,
-    flags: MapiMessageFlags,
-    originator: Option<RecipientDescriptor>,
+    _message_type: Option<String>,
+    _date_received: Option<String>,
+    _conversation_id: Option<String>,
+    _flags: MapiMessageFlags,
+    _originator: Option<RecipientDescriptor>,
     recips: Vec<RecipientDescriptor>,
     files: Vec<FileDescriptor>,
 }
@@ -103,11 +103,11 @@ impl TryFrom<*const RawMapiMessage> for Message {
             Ok(Message {
                 subject: conversion::maybe_string_from_raw_ptr(raw.subject),
                 note_text: conversion::maybe_string_from_raw_ptr(raw.note_text),
-                message_type: conversion::maybe_string_from_raw_ptr(raw.message_type),
-                date_received: conversion::maybe_string_from_raw_ptr(raw.date_received),
-                conversation_id: conversion::maybe_string_from_raw_ptr(raw.conversation_id),
-                flags: raw.flags,
-                originator: originator_result.ok(),
+                _message_type: conversion::maybe_string_from_raw_ptr(raw.message_type),
+                _date_received: conversion::maybe_string_from_raw_ptr(raw.date_received),
+                _conversation_id: conversion::maybe_string_from_raw_ptr(raw.conversation_id),
+                _flags: raw.flags,
+                _originator: originator_result.ok(),
                 recips,
                 files,
             })
@@ -192,11 +192,11 @@ impl Message {
         Self {
             subject: subject.map(|s| s.to_owned()),
             note_text: body.map(|b| b.to_owned()),
-            message_type: None,
-            date_received: None,
-            conversation_id: None,
-            flags: MapiMessageFlags::empty(),
-            originator: None,
+            _message_type: None,
+            _date_received: None,
+            _conversation_id: None,
+            _flags: MapiMessageFlags::empty(),
+            _originator: None,
             recips: to
                 .into_iter()
                 .map(|t| RecipientDescriptor::new(t))
@@ -223,11 +223,11 @@ impl Message {
         Self {
             subject: None,
             note_text: None,
-            message_type: None,
-            date_received: None,
-            conversation_id: None,
-            flags: MapiMessageFlags::empty(),
-            originator: None,
+            _message_type: None,
+            _date_received: None,
+            _conversation_id: None,
+            _flags: MapiMessageFlags::empty(),
+            _originator: None,
             recips: vec![],
             files,
         }

src/structs/recipient_descriptor.rs

@@ -22,10 +22,10 @@ pub struct RawMapiRecipDesc {
 
 #[derive(Debug)]
 pub struct RecipientDescriptor {
-    recip_class: ULong,
-    name: String,
+    _recip_class: ULong,
+    _name: String,
     pub address: Option<String>,
-    entry_id: Vec<u8>,
+    _entry_id: Vec<u8>,
 }
 
 impl TryFrom<*const RawMapiRecipDesc> for RecipientDescriptor {
@@ -70,11 +70,11 @@ impl From<&RawMapiRecipDesc> for RecipientDescriptor {
         });
 
         RecipientDescriptor {
-            recip_class: raw.recip_class,
-            name: conversion::maybe_string_from_raw_ptr(raw.name)
+            _recip_class: raw.recip_class,
+            _name: conversion::maybe_string_from_raw_ptr(raw.name)
                 .unwrap_or_else(|| "MISSING_RECIP_NAME".to_owned()),
             address,
-            entry_id: conversion::copy_c_array_to_vec(raw.entry_id, raw.eid_size as usize),
+            _entry_id: conversion::copy_c_array_to_vec(raw.entry_id, raw.eid_size as usize),
         }
     }
 }
@@ -83,10 +83,10 @@ impl RecipientDescriptor {
     #[cfg(test)]
     pub fn new(address: &str) -> Self {
         Self {
-            recip_class: 0,
-            name: "".to_owned(),
+            _recip_class: 0,
+            _name: "".to_owned(),
             address: Some(address.to_owned()),
-            entry_id: vec![0, 0, 0, 0],
+            _entry_id: vec![0, 0, 0, 0],
         }
     }
 }