Merge #6639

6639: Use `ExpandResult` instead of `MacroResult` r=jonas-schievink a=jonas-schievink

`MacroResult` is redundant.

bors r+ :robot:

Co-authored-by: Jonas Schievink <[email protected]>

1 files changed, 8 insertions, 0 deletions

diff --git a/crates/mbe/src/lib.rs b/crates/mbe/src/lib.rs
index 183e3b988..22fbf9a80 100644
--- a/crates/mbe/src/lib.rs
+++ b/crates/mbe/src/lib.rs
@@ -33,6 +33,7 @@ pub enum ExpandError {
     ConversionError,
     InvalidRepeat,
     ProcMacroError(tt::ExpansionError),
+    Other(String),
 }
 
 impl From<tt::ExpansionError> for ExpandError {
@@ -264,6 +265,13 @@ impl<T> ExpandResult<T> {
         Self { value: Default::default(), err: Some(err) }
     }
 
+    pub fn str_err(err: String) -> Self
+    where
+        T: Default,
+    {
+        Self::only_err(ExpandError::Other(err))
+    }
+
     pub fn map<U>(self, f: impl FnOnce(T) -> U) -> ExpandResult<U> {
         ExpandResult { value: f(self.value), err: self.err }
     }