From 29e6238cb7330f7d29f33ff03a4ccc0a0cec9f4d Mon Sep 17 00:00:00 2001
From: David Lattimore <dml@google.com>
Date: Tue, 18 Aug 2020 20:39:55 +1000
Subject: SSR: A few small refactorings

---
 crates/ssr/Cargo.toml       |  1 +
 crates/ssr/src/replacing.rs | 13 +++++++------
 crates/ssr/src/tests.rs     |  1 +
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'crates')

diff --git a/crates/ssr/Cargo.toml b/crates/ssr/Cargo.toml
index 56c1f7761..7c2090de3 100644
--- a/crates/ssr/Cargo.toml
+++ b/crates/ssr/Cargo.toml
@@ -12,6 +12,7 @@ doctest = false
 
 [dependencies]
 rustc-hash = "1.1.0"
+itertools = "0.9.0"
 
 text_edit = { path = "../text_edit" }
 syntax = { path = "../syntax" }
diff --git a/crates/ssr/src/replacing.rs b/crates/ssr/src/replacing.rs
index 21d0aa8a8..29284e3f1 100644
--- a/crates/ssr/src/replacing.rs
+++ b/crates/ssr/src/replacing.rs
@@ -1,9 +1,11 @@
 //! Code for applying replacement templates for matches that have previously been found.
 
 use crate::{resolving::ResolvedRule, Match, SsrMatches};
+use itertools::Itertools;
 use rustc_hash::{FxHashMap, FxHashSet};
 use syntax::ast::{self, AstToken};
 use syntax::{SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken, TextRange, TextSize};
+use test_utils::mark;
 use text_edit::TextEdit;
 
 /// Returns a text edit that will replace each match in `matches` with its corresponding replacement
@@ -127,6 +129,7 @@ impl ReplacementRenderer<'_> {
                     && (placeholder_value.autoderef_count > 0
                         || placeholder_value.autoref_kind != ast::SelfParamKind::Owned)
                 {
+                    mark::hit!(replace_autoref_autoderef_capture);
                     let ref_kind = match placeholder_value.autoref_kind {
                         ast::SelfParamKind::Owned => "",
                         ast::SelfParamKind::Ref => "&",
@@ -206,18 +209,16 @@ fn token_is_method_call_receiver(token: &SyntaxToken) -> bool {
     use syntax::ast::AstNode;
     // Find the first method call among the ancestors of `token`, then check if the only token
     // within the receiver is `token`.
-    if let Some(receiver) = token
-        .ancestors()
-        .find(|node| node.kind() == SyntaxKind::METHOD_CALL_EXPR)
-        .and_then(|node| ast::MethodCallExpr::cast(node).unwrap().expr())
+    if let Some(receiver) =
+        token.ancestors().find_map(ast::MethodCallExpr::cast).and_then(|call| call.expr())
     {
-        let mut tokens = receiver.syntax().descendants_with_tokens().filter_map(|node_or_token| {
+        let tokens = receiver.syntax().descendants_with_tokens().filter_map(|node_or_token| {
             match node_or_token {
                 SyntaxElement::Token(t) => Some(t),
                 _ => None,
             }
         });
-        if let (Some(only_token), None) = (tokens.next(), tokens.next()) {
+        if let Some((only_token,)) = tokens.collect_tuple() {
             return only_token == *token;
         }
     }
diff --git a/crates/ssr/src/tests.rs b/crates/ssr/src/tests.rs
index 0ad3512ba..e45c88864 100644
--- a/crates/ssr/src/tests.rs
+++ b/crates/ssr/src/tests.rs
@@ -1179,6 +1179,7 @@ fn replace_autoref_autoderef_capture() {
     // second, we already have a reference, so it isn't. When $a is used in a context where autoref
     // doesn't apply, we need to prefix it with `&`. Finally, we have some cases where autoderef
     // needs to be applied.
+    mark::check!(replace_autoref_autoderef_capture);
     let code = r#"
         struct Foo {}
         impl Foo {
-- 
cgit v1.2.3