From d6b622cdef6af45aff46650c247940a590afde92 Mon Sep 17 00:00:00 2001
From: Florian Diebold <flodiebold@gmail.com>
Date: Mon, 16 Mar 2020 18:04:07 +0100
Subject: Some cleanup

---
 crates/ra_mbe/src/mbe_expander.rs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/crates/ra_mbe/src/mbe_expander.rs b/crates/ra_mbe/src/mbe_expander.rs
index 0a4d73dda..3c00e3b64 100644
--- a/crates/ra_mbe/src/mbe_expander.rs
+++ b/crates/ra_mbe/src/mbe_expander.rs
@@ -20,18 +20,20 @@ fn expand_rules(rules: &[crate::Rule], input: &tt::Subtree) -> ExpandResult<tt::
     for rule in rules {
         let ExpandResult(new_match, bindings_err) = matcher::match_(&rule.lhs, input);
         if bindings_err.is_none() {
-            // if we find a rule that applies without errors, we're done
+            // If we find a rule that applies without errors, we're done.
+            // Unconditionally returning the transcription here makes the
+            // `test_repeat_bad_var` test fail.
             let ExpandResult(res, transcribe_err) =
                 transcriber::transcribe(&rule.rhs, &new_match.bindings);
             if transcribe_err.is_none() {
                 return ExpandResult::ok(res);
             }
         }
-        // use the rule if we matched more tokens, or had fewer patterns left
+        // Use the rule if we matched more tokens, or had fewer patterns left,
+        // or had no error
         if let Some((prev_match, _)) = &match_ {
-            if new_match.unmatched_tokens < prev_match.unmatched_tokens
-                || new_match.unmatched_tokens == prev_match.unmatched_tokens
-                    && new_match.unmatched_patterns < prev_match.unmatched_patterns
+            if (new_match.unmatched_tokens, new_match.unmatched_patterns)
+                < (prev_match.unmatched_tokens, prev_match.unmatched_patterns)
                 || err.is_some() && bindings_err.is_none()
             {
                 match_ = Some((new_match, rule));
-- 
cgit v1.2.3