diff options
| author | Johann Hemmann <johann.hemmann@code.berlin> | 2024-01-19 15:58:27 +0100 |
|---|---|---|
| committer | Johann Hemmann <johann.hemmann@code.berlin> | 2024-01-19 17:31:01 +0100 |
| commit | 0df30499d0b1bd23fdb9776e3fbf7975bc1a8cb3 (patch) | |
| tree | 551acd8a13abd713bd1d650f30d939de69b1425f | |
| parent | bef355168a05beeeb523dcba0c634d38bd5c8c55 (diff) | |
| download | rust-0df30499d0b1bd23fdb9776e3fbf7975bc1a8cb3.tar.gz rust-0df30499d0b1bd23fdb9776e3fbf7975bc1a8cb3.zip | |
only_used_in_recursion
| -rw-r--r-- | Cargo.toml | 1 | ||||
| -rw-r--r-- | crates/ide-ssr/src/matching.rs | 1 | ||||
| -rw-r--r-- | crates/mbe/src/expander/transcriber.rs | 12 |
3 files changed, 6 insertions, 8 deletions
diff --git a/Cargo.toml b/Cargo.toml index 3abf96ffaa5..989662db145 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -179,7 +179,6 @@ needless_doctest_main = "allow" new_without_default = "allow" non_canonical_clone_impl = "allow" non_canonical_partial_ord_impl = "allow" -only_used_in_recursion = "allow" op_ref = "allow" option_map_unit_fn = "allow" partialeq_to_none = "allow" diff --git a/crates/ide-ssr/src/matching.rs b/crates/ide-ssr/src/matching.rs index 113457ba97e..060897a6852 100644 --- a/crates/ide-ssr/src/matching.rs +++ b/crates/ide-ssr/src/matching.rs @@ -310,6 +310,7 @@ impl<'db, 'sema> Matcher<'db, 'sema> { Ok(()) } + #[allow(clippy::only_used_in_recursion)] fn check_constraint( &self, constraint: &Constraint, diff --git a/crates/mbe/src/expander/transcriber.rs b/crates/mbe/src/expander/transcriber.rs index b3fb0e8de13..5b7a25408a8 100644 --- a/crates/mbe/src/expander/transcriber.rs +++ b/crates/mbe/src/expander/transcriber.rs @@ -282,9 +282,9 @@ fn expand_subtree<S: Span>( } let res = if ctx.new_meta_vars { - count(ctx, binding, 0, depth.unwrap_or(0)) + count(binding, 0, depth.unwrap_or(0)) } else { - count_old(ctx, binding, 0, *depth) + count_old(binding, 0, *depth) }; let c = match res { @@ -537,7 +537,6 @@ fn fix_up_and_push_path_tt<S: Span>( /// Handles `${count(t, depth)}`. `our_depth` is the recursion depth and `count_depth` is the depth /// defined by the metavar expression. fn count<S>( - ctx: &ExpandCtx<'_, S>, binding: &Binding<S>, depth_curr: usize, depth_max: usize, @@ -547,7 +546,7 @@ fn count<S>( if depth_curr == depth_max { Ok(bs.len()) } else { - bs.iter().map(|b| count(ctx, b, depth_curr + 1, depth_max)).sum() + bs.iter().map(|b| count(b, depth_curr + 1, depth_max)).sum() } } Binding::Empty => Ok(0), @@ -556,16 +555,15 @@ fn count<S>( } fn count_old<S>( - ctx: &ExpandCtx<'_, S>, binding: &Binding<S>, our_depth: usize, count_depth: Option<usize>, ) -> Result<usize, CountError> { match binding { Binding::Nested(bs) => match count_depth { - None => bs.iter().map(|b| count_old(ctx, b, our_depth + 1, None)).sum(), + None => bs.iter().map(|b| count_old(b, our_depth + 1, None)).sum(), Some(0) => Ok(bs.len()), - Some(d) => bs.iter().map(|b| count_old(ctx, b, our_depth + 1, Some(d - 1))).sum(), + Some(d) => bs.iter().map(|b| count_old(b, our_depth + 1, Some(d - 1))).sum(), }, Binding::Empty => Ok(0), Binding::Fragment(_) | Binding::Missing(_) => { |