Fix macro scopes and avoid exporting them unnecessarily

src/bin/mfs_tool.rs

@@ -20,9 +20,10 @@
 
 #![deny(clippy::all)]
 #![deny(clippy::pedantic)]
+#![allow(clippy::uninlined_format_args)]    // Added in Rust 1.66
 
 use std::fs::File;
-use std::io::{Cursor, BufReader, BufWriter, Result};
+use std::io::{Cursor, BufReader, BufWriter, Result, Error, ErrorKind};
 use std::mem::size_of;
 use std::path::{Path, PathBuf};
 use std::process::ExitCode;
@@ -33,7 +34,6 @@ use log::{error, warn};
 
 use moulars::file_srv::Manifest;
 use moulars::file_srv::data_cache::cache_clients;
-use moulars::general_error;
 use moulars::plasma::{StreamRead, PakFile};
 use moulars::plasma::file_crypt::EncryptedReader;
 
@@ -139,26 +139,20 @@ fn main() -> ExitCode {
 fn get_key(key_opt: Option<&str>) -> Result<[u32; 4]> {
     if let Some(key_str) = key_opt {
         let mut buffer = [0; 16];
-        match hex::decode_to_slice(key_str, &mut buffer) {
-            Ok(()) => {
-                let mut key = [0; 4];
-                for (src, dest) in buffer.chunks_exact(size_of::<u32>()).zip(key.iter_mut()) {
-                    *dest = u32::from_be_bytes(src.try_into().unwrap());
-                }
-                Ok(key)
-            }
-            Err(err) => {
-                Err(general_error!("Invalid key value: {}", err))
-            }
+        hex::decode_to_slice(key_str, &mut buffer).map_err(|err| {
+            Error::new(ErrorKind::Other, format!("Invalid key value: {}", err))
+        })?;
+        let mut key = [0; 4];
+        for (src, dest) in buffer.chunks_exact(size_of::<u32>()).zip(key.iter_mut()) {
+            *dest = u32::from_be_bytes(src.try_into().unwrap());
         }
+        Ok(key)
     } else {
         Ok(moulars::plasma::file_crypt::DEFAULT_KEY)
     }
 }
 
-fn decrypt_file(path: &Path, out_file: Option<&Path>, key_opt: Option<&str>)
-    -> Result<()>
-{
+fn decrypt_file(path: &Path, out_file: Option<&Path>, key_opt: Option<&str>) -> Result<()> {
     let key = get_key(key_opt)?;
     let mut stream = EncryptedReader::new(BufReader::new(File::open(path)?), &key)?;
     if let Some(out_filename) = out_file {
@@ -183,8 +177,7 @@ fn decrypt_file(path: &Path, out_file: Option<&Path>, key_opt: Option<&str>)
     Ok(())
 }
 
-fn list_pak(path: &Path, key_opt: Option<&str>) -> Result<()>
-{
+fn list_pak(path: &Path, key_opt: Option<&str>) -> Result<()> {
     let key = get_key(key_opt)?;
     let file_reader = BufReader::new(File::open(path)?);
     let mut stream = BufReader::new(EncryptedReader::new(file_reader, &key)?);

src/lib.rs

@@ -43,7 +43,6 @@ pub mod netcli;
 pub mod path_utils;
 
 // Shortcut for generating (optionally formatted) general errors as std::io::Error
-#[macro_export]
 macro_rules! general_error {
     ($message:literal) => (
         ::std::io::Error::new(::std::io::ErrorKind::Other, $message)
@@ -52,3 +51,4 @@ macro_rules! general_error {
         ::std::io::Error::new(::std::io::ErrorKind::Other, format!($message, $($arg),+))
     );
 }
+pub(crate) use general_error;

src/plasma/audio/sound_buffer.rs

@@ -18,8 +18,8 @@ use std::io::{BufRead, Result, Write};
 
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 
-use crate::derive_creatable;
 use crate::plasma::{Key, StreamRead, StreamWrite};
+use crate::plasma::creatable::derive_creatable;
 use crate::plasma::safe_string::{read_safe_str, write_safe_str, StringFormat};
 
 pub struct SoundBuffer {

src/plasma/creatable.rs

@@ -114,7 +114,6 @@ pub(crate) enum ClassID {
     Nil = 0x8000,
 }
 
-#[macro_export]
 macro_rules! derive_creatable {
     ($name:ident) => {
         derive_creatable! { $name @lines[] }
@@ -133,3 +132,4 @@ macro_rules! derive_creatable {
         }
     };
 }
+pub(crate) use derive_creatable;

src/plasma/messages/message_with_callbacks.rs

@@ -18,9 +18,10 @@ use std::io::{BufRead, Write, Result};
 
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 
-use crate::{general_error, derive_creatable};
+use crate::general_error;
 use crate::plasma::{StreamRead, StreamWrite};
 use crate::plasma::Factory;
+use crate::plasma::creatable::derive_creatable;
 use super::{Message, MessageInterface};
 
 pub struct MessageWithCallbacks {

src/plasma/net_common/generic_value.rs

@@ -20,8 +20,9 @@ use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 use num_derive::FromPrimitive;
 use num_traits::FromPrimitive;
 
-use crate::{general_error, derive_creatable};
+use crate::general_error;
 use crate::plasma::{StreamRead, StreamWrite};
+use crate::plasma::creatable::derive_creatable;
 use crate::plasma::safe_string::{read_safe_str, write_safe_str, StringFormat};
 
 pub enum GenericType {

src/plasma/net_messages/net_message.rs

@@ -19,8 +19,8 @@ use std::io::{BufRead, Result, Write};
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 use uuid::Uuid;
 
-use crate::plasma::{UnifiedTime, StreamRead, StreamWrite};
 use crate::general_error;
+use crate::plasma::{UnifiedTime, StreamRead, StreamWrite};
 
 pub struct NetMessage {
     content_flags: u32,