language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use ExpandResult instead of MacroResult

Browse source 
`MacroResult` is redundant
This commit is contained in:
Jonas Schievink 2020-11-26 16:48:17 +01:00
parent 1542797284
commit 6a9338e979
5 changed files with 42 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/mbe/src/lib.rs
View file

@ -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 }
}