Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/mbe/src/expander/transcriber.rs')
| -rw-r--r-- | crates/mbe/src/expander/transcriber.rs | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/crates/mbe/src/expander/transcriber.rs b/crates/mbe/src/expander/transcriber.rs index b5ae5b91bb..e24a75a9b0 100644 --- a/crates/mbe/src/expander/transcriber.rs +++ b/crates/mbe/src/expander/transcriber.rs @@ -17,34 +17,32 @@ impl Bindings { fn get(&self, name: &str, nesting: &mut [NestingState]) -> Result<&Fragment, ExpandError> { macro_rules! binding_err { - ($($arg:tt)*) => { ExpandError::BindingError(format!($($arg)*)) }; + ($($arg:tt)*) => { ExpandError::BindingError(format!($($arg)*).into()) }; } - let mut b: &Binding = self - .inner - .get(name) - .ok_or_else(|| binding_err!("could not find binding `{}`", name))?; + let mut b: &Binding = + self.inner.get(name).ok_or_else(|| binding_err!("could not find binding `{name}`"))?; for nesting_state in nesting.iter_mut() { nesting_state.hit = true; b = match b { Binding::Fragment(_) => break, Binding::Nested(bs) => bs.get(nesting_state.idx).ok_or_else(|| { nesting_state.at_end = true; - binding_err!("could not find nested binding `{}`", name) + binding_err!("could not find nested binding `{name}`") })?, Binding::Empty => { nesting_state.at_end = true; - return Err(binding_err!("could not find empty binding `{}`", name)); + return Err(binding_err!("could not find empty binding `{name}`")); } }; } match b { Binding::Fragment(it) => Ok(it), Binding::Nested(_) => { - Err(binding_err!("expected simple binding, found nested binding `{}`", name)) + Err(binding_err!("expected simple binding, found nested binding `{name}`")) } Binding::Empty => { - Err(binding_err!("expected simple binding, found empty binding `{}`", name)) + Err(binding_err!("expected simple binding, found empty binding `{name}`")) } } } @@ -180,7 +178,7 @@ fn expand_repeat( ); return ExpandResult { value: Fragment::Tokens(Subtree::default().into()), - err: Some(ExpandError::Other("Expand exceed limit".to_string())), + err: Some(ExpandError::Other("Expand exceed limit".into())), }; } |