aboutsummaryrefslogtreecommitdiff
path: root/crates/mbe/src/mbe_expander/matcher.rs
diff options
context:
space:
mode:
authorJonas Schievink <[email protected]>2020-11-26 15:04:23 +0000
committerJonas Schievink <[email protected]>2020-11-26 15:04:23 +0000
commitc784c8ec766edf4c7ab558f71d3f87e6c7c870b9 (patch)
tree58b0150a27a6b35000d745807461100786952e93 /crates/mbe/src/mbe_expander/matcher.rs
parent0bcd8147ec08db2a94dd2a3068a527ba6c47a4cd (diff)
Use named fields in `ExpandResult`
Diffstat (limited to 'crates/mbe/src/mbe_expander/matcher.rs')
-rw-r--r--crates/mbe/src/mbe_expander/matcher.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/crates/mbe/src/mbe_expander/matcher.rs b/crates/mbe/src/mbe_expander/matcher.rs
index 39a8eefbd..3f8445897 100644
--- a/crates/mbe/src/mbe_expander/matcher.rs
+++ b/crates/mbe/src/mbe_expander/matcher.rs
@@ -158,7 +158,8 @@ fn match_subtree(
158 continue; 158 continue;
159 } 159 }
160 }; 160 };
161 let ExpandResult(matched, match_err) = match_meta_var(kind.as_str(), src); 161 let ExpandResult { value: matched, err: match_err } =
162 match_meta_var(kind.as_str(), src);
162 match matched { 163 match matched {
163 Some(fragment) => { 164 Some(fragment) => {
164 res.bindings.inner.insert(name.clone(), Binding::Fragment(fragment)); 165 res.bindings.inner.insert(name.clone(), Binding::Fragment(fragment));
@@ -342,17 +343,17 @@ impl<'a> TtIter<'a> {
342 token_trees: res.into_iter().cloned().collect(), 343 token_trees: res.into_iter().cloned().collect(),
343 })), 344 })),
344 }; 345 };
345 ExpandResult(res, err) 346 ExpandResult { value: res, err }
346 } 347 }
347 348
348 pub(crate) fn eat_vis(&mut self) -> Option<tt::TokenTree> { 349 pub(crate) fn eat_vis(&mut self) -> Option<tt::TokenTree> {
349 let mut fork = self.clone(); 350 let mut fork = self.clone();
350 match fork.expect_fragment(Visibility) { 351 match fork.expect_fragment(Visibility) {
351 ExpandResult(tt, None) => { 352 ExpandResult { value: tt, err: None } => {
352 *self = fork; 353 *self = fork;
353 tt 354 tt
354 } 355 }
355 ExpandResult(_, Some(_)) => None, 356 ExpandResult { value: _, err: Some(_) } => None,
356 } 357 }
357 } 358 }
358} 359}