refactor: use static strings for command name in error

rozukke · Dec 19, 2024 · 5192314 · 5192314
1 parent 74176cf
commit 5192314
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/src/debugger/command.rs b/src/debugger/command.rs
@@ -104,10 +104,10 @@ pub enum Error {
         name: String,
     },
     MissingSubcommand {
-        name: String,
+        name: &'static str,
     },
     InvalidSubcommand {
-        name: String,
+        name: &'static str,
         subname: String,
     },
     InvalidArgument {
@@ -141,33 +141,34 @@ impl fmt::Display for Error {
             Self::MissingSubcommand { name } => {
                 write!(f, "Missing subcommand for `{}`.", name)
             }
-            Self::InvalidArgument { name, error } => match error {
-                ArgumentError::MissingArgument { argument } => {
-                    write!(f, "Missing argument `{}` for command `{}`.", argument, name)
-                }
-                ArgumentError::TooManyArguments {} => {
-                    write!(f, "Too many arguments for command `{}`.", name)
-                }
-                ArgumentError::WrongArgumentType { argument } => {
-                    write!(
-                        f,
-                        "Invalid type for argument `{}` for command `{}`.",
-                        argument, name
-                    )
-                }
-                ArgumentError::MalformedArgument {} => {
-                    write!(f, "Malformed argument for command `{}`.", name)
-                }
-                ArgumentError::MalformedInteger {} => {
-                    write!(f, "Malformed integer argument for command `{}`.", name)
-                }
-                ArgumentError::MalformedLabel {} => {
-                    write!(f, "Malformed label argument for command `{}`.", name)
-                }
-                ArgumentError::IntegerTooLarge {} => {
-                    write!(f, "Integer argument too large for command `{}`.", name)
+
+            Self::InvalidArgument { name, error } => {
+                match error {
+                    ArgumentError::MissingArgument { argument } => {
+                        write!(f, "Missing argument `{}`", argument)?;
+                    }
+                    ArgumentError::TooManyArguments {} => {
+                        write!(f, "Too many arguments")?;
+                    }
+                    ArgumentError::WrongArgumentType { argument } => {
+                        write!(f, "Invalid type for argument `{}`", argument)?;
+                    }
+                    ArgumentError::MalformedArgument {} => {
+                        write!(f, "Malformed argument")?;
+                    }
+                    ArgumentError::MalformedInteger {} => {
+                        write!(f, "Malformed integer argument")?;
+                    }
+                    ArgumentError::MalformedLabel {} => {
+                        write!(f, "Malformed label argument")?;
+                    }
+                    ArgumentError::IntegerTooLarge {} => {
+                        write!(f, "Integer argument too large")?;
+                    }
                 }
-            },
+
+                write!(f, " for command `{}`", name)
+            }
         }
     }
 }

diff --git a/src/debugger/parse.rs b/src/debugger/parse.rs
@@ -132,7 +132,8 @@ impl<'a> CommandIter<'a> {
 
         // This could be written a bit nicer. But it doesn't seem necessary.
         if matches(name, &["break", "b"]) {
-            let name = name.to_string();
+            let name = "break";
+
             let Some(subname) = self.next_command_name_part() else {
                 return Err(Error::MissingSubcommand { name });
             };