Externalize executable macros crate and update dependencies to use getargs-derive

Cargo.toml

@@ -135,6 +135,7 @@ embedded-io = { version = "0.7", features = ["alloc"] }
 embedded-tls = { version = "0.19", default-features = false, features = [
   "alloc",
 ] }
+getargs-derive = { git = "https://github.com/AlixANNERAUD/getargs-derive.git", branch = "main" }
 
 [workspace]
 members = [
@@ -153,7 +154,6 @@ members = [
   "executables/file_manager",
   "executables/shell/command_line",
   "modules/executable",
-  "modules/executable/macros",
   "executables/wasm",
   "executables/wasm/bindings",
   "executables/wasm/tests/wasm_test",

executables/shell/command_line/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2024"
 [dependencies]
 xila = { path = "../../../" }
 getargs = { version = "0.5" }
-executable_macros = { path = "../../../modules/executable/macros" }
+getargs-derive = { workspace = true }
 
 [target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))'.dev-dependencies]
 drivers_native = { workspace = true }

executables/shell/command_line/locales/en.json

@@ -1,4 +1,5 @@
 {
+  "Argument parsing error: {}": "Argument parsing error: {}",
   "Accessed": "Accessed",
   "Authentication failed: {}": "Authentication failed: {}",
   "Cannot resolve {}: Unknown host": "Cannot resolve {}: Unknown host",

executables/shell/command_line/locales/fr.json

@@ -1,4 +1,5 @@
 {
+  "Argument parsing error: {}": "Erreur d'analyse des arguments: {}",
   "Accessed": "Accédé",
   "Authentication failed: {}": "Échec de l'authentification: {}",
   "Cannot resolve {}: Unknown host": "Impossible de résoudre {}: Hôte inconnu",

executables/shell/command_line/src/commands/change_directory.rs

@@ -1,6 +1,6 @@
 use crate::{Error, Result};
 use alloc::borrow::ToOwned;
-use executable_macros::GetArgs;
+use getargs_derive::GetArgs;
 use xila::{
     file_system::Path,
     virtual_file_system::{self, Directory},

executables/shell/command_line/src/commands/clear.rs

@@ -1,6 +1,6 @@
 use crate::Result;
-use executable_macros::GetArgs;
 use getargs::Options;
+use getargs_derive::GetArgs;
 use xila::file_system::Path;
 
 use super::{CommandContext, UserCommand};

executables/shell/command_line/src/commands/directory.rs

@@ -1,7 +1,7 @@
 use crate::{Error, Result};
 use alloc::borrow::ToOwned;
-use executable_macros::GetArgs;
 use getargs::Options;
+use getargs_derive::GetArgs;
 use xila::{
     file_system::{Kind, Path},
     virtual_file_system::{self, Directory},

executables/shell/command_line/src/commands/dns.rs

@@ -1,6 +1,6 @@
 use crate::Result;
-use executable_macros::GetArgs;
 use getargs::Options;
+use getargs_derive::GetArgs;
 use xila::{
     file_system::Path,
     internationalization::translate,

executables/shell/command_line/src/commands/environment_variables.rs

@@ -1,6 +1,6 @@
 use crate::{Error, Result};
-use executable_macros::GetArgs;
 use getargs::Options;
+use getargs_derive::GetArgs;
 use xila::{file_system::Path, task};
 
 use super::{CommandContext, UserCommand};

executables/shell/command_line/src/commands/exit.rs

@@ -1,5 +1,5 @@
-use executable_macros::GetArgs;
 use getargs::Options;
+use getargs_derive::GetArgs;
 use xila::file_system::Path;
 
 use crate::Result;

executables/shell/command_line/src/commands/head.rs

@@ -1,6 +1,6 @@
 use crate::{Error, Result};
 use alloc::{borrow::ToOwned, vec::Vec};
-use executable_macros::GetArgs;
+use getargs_derive::GetArgs;
 use xila::{
     file_system::{AccessFlags, Path},
     virtual_file_system::{self, File},

executables/shell/command_line/src/commands/ip.rs

@@ -1,5 +1,5 @@
 use crate::error::{Error, Result};
-use executable_macros::GetArgs;
+use getargs_derive::GetArgs;
 use xila::{
     file_system::{AccessFlags, Path},
     log,

executables/shell/command_line/src/commands/list.rs

@@ -1,7 +1,7 @@
 use crate::{Error, Result};
 use alloc::borrow::ToOwned;
 use alloc::string::ToString;
-use executable_macros::GetArgs;
+use getargs_derive::GetArgs;
 use xila::{
     file_system::{Kind, Path},
     log, users,

executables/shell/command_line/src/commands/ping.rs

@@ -1,4 +1,4 @@
-use executable_macros::GetArgs;
+use getargs_derive::GetArgs;
 use xila::{
     file_system::Path,
     internationalization::translate,

executables/shell/command_line/src/commands/statistics.rs

@@ -1,7 +1,7 @@
 use crate::{Error, Result};
 use alloc::{borrow::ToOwned, format, string::String};
-use executable_macros::GetArgs;
 use getargs::Options;
+use getargs_derive::GetArgs;
 use xila::{
     file_system::Path,
     internationalization::translate,

executables/shell/command_line/src/commands/tail.rs

@@ -1,6 +1,6 @@
 use crate::{Error, Result};
 use alloc::{borrow::ToOwned, vec::Vec};
-use executable_macros::GetArgs;
+use getargs_derive::GetArgs;
 use xila::{
     file_system::{AccessFlags, Path},
     virtual_file_system::{self, File},

executables/shell/command_line/src/commands/which.rs

@@ -1,6 +1,6 @@
 use alloc::borrow::ToOwned;
-use executable_macros::GetArgs;
 use getargs::Options;
+use getargs_derive::GetArgs;
 use xila::{file_system::Path, virtual_file_system};
 
 use crate::{Result, error::Error, resolver::resolve};

executables/shell/command_line/src/commands/word_count.rs

@@ -1,6 +1,6 @@
 use crate::{Error, Result};
 use alloc::borrow::ToOwned;
-use executable_macros::GetArgs;
+use getargs_derive::GetArgs;
 use xila::{
     file_system::{AccessFlags, Path},
     virtual_file_system::{self, File},

executables/shell/command_line/src/error.rs

@@ -35,6 +35,7 @@ pub enum Error {
     FailedToReadFile(virtual_file_system::Error),
     RequiresValue,
     DoesNotRequireValue,
+    ArgumentParsing(getargs_derive::Error),
     InvalidArgument,
     MissingPositionalArgument(&'static str),
     InvalidOption,
@@ -55,6 +56,12 @@ impl<A: getargs::Argument> From<getargs::Error<A>> for Error {
     }
 }
 
+impl From<getargs_derive::Error> for Error {
+    fn from(value: getargs_derive::Error) -> Self {
+        Error::ArgumentParsing(value)
+    }
+}
+
 impl Error {
     pub fn get_discriminant(&self) -> NonZeroU16 {
         unsafe { *<*const _>::from(self).cast::<NonZeroU16>() }
@@ -188,6 +195,9 @@ impl Display for Error {
             Error::FailedToCreateSocket(error) => {
                 write!(formatter, translate!("Failed to create socket: {}"), error)
             }
+            Error::ArgumentParsing(error) => {
+                write!(formatter, translate!("Argument parsing error: {}"), error)
+            }
             Error::Format => {
                 write!(formatter, translate!("Format error"))
             }

executables/shell/graphical/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2024"
 xila = { path = "../../../", features = ["graphics"] }
 miniserde = { workspace = true }
 getargs = { version = "0.5" }
-executable_macros = { path = "../../../modules/executable/macros" }
+getargs-derive = { workspace = true }
 
 [target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))'.dev-dependencies]
 drivers_native = { workspace = true }

executables/shell/graphical/src/lib.rs

@@ -15,7 +15,7 @@ use alloc::{boxed::Box, string::String, vec::Vec};
 use core::fmt::Write;
 use core::num::NonZeroUsize;
 use core::time::Duration;
-use executable_macros::GetArgs;
+use getargs_derive::GetArgs;
 use home::Home;
 use layout::Layout;
 use login::Login;

executables/wasm/Cargo.toml

@@ -12,7 +12,7 @@ wamr-rust-sdk = { git = "https://github.com/bytecodealliance/wamr-rust-sdk.git",
   "instruction-metering",
 ], optional = true }
 getargs = { version = "0.5" }
-executable_macros = { path = "../../modules/executable/macros" }
+getargs-derive = { workspace = true }
 smol_str = { workspace = true }
 
 [features]

executables/wasm/src/host/mod.rs

@@ -6,7 +6,7 @@ use alloc::string::ToString;
 use alloc::{borrow::ToOwned, string::String, vec, vec::Vec};
 use core::fmt::Write;
 use core::num::{NonZeroU32, NonZeroUsize};
-use executable_macros::GetArgs;
+use getargs_derive::GetArgs;
 use xila::executable::ExecutableTrait;
 use xila::executable::MainFuture;
 use xila::executable::Standard;

executables/wasm/src/host/virtual_machine/error.rs

@@ -108,6 +108,20 @@ impl From<RuntimeError> for Error {
         }
     }
 }
+impl From<getargs_derive::Error> for Error {
+    fn from(value: getargs_derive::Error) -> Self {
+        match value {
+            getargs_derive::Error::MissingPositionalArgument(name) => {
+                Error::MissingPositionalArgument(name)
+            }
+            getargs_derive::Error::UnknownOption => Error::InvalidOption,
+            getargs_derive::Error::MissingOptionValue(name) => Error::MissingArgument(name),
+            getargs_derive::Error::ParseError(_) => Error::InvalidOption,
+            getargs_derive::Error::InvalidNumberOfArguments => Error::InvalidNumberOfArguments,
+        }
+    }
+}
+
 impl From<task::Error> for Error {
     fn from(error: task::Error) -> Self {
         Error::FailedToGetTaskInformations(error)