Skip to content

Commit 873119c

Browse files
committed
Fix clippy collapsible if
1 parent 42724dd commit 873119c

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

src/scan.rs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -218,31 +218,29 @@ pub fn find_algorithms<'a>(
218218
matched = true;
219219
break;
220220
}
221-
if text != match_text {
222-
if let Some(m) = re.find(match_text) {
223-
if let Some((_, map)) = resolved.as_ref() {
224-
let start = m.start();
225-
let end = m.end().min(map.len());
226-
if start < map.len() {
227-
let mut mapped = map[start];
228-
let slice = &map[start..end];
229-
for i in 0..slice.len() {
230-
let prev = i.checked_sub(1).map(|p| slice[p]);
231-
let next = slice.get(i + 1).copied();
232-
if prev == Some(slice[i])
233-
|| next == Some(slice[i])
234-
|| prev.is_some_and(|p| slice[i] != p + 1)
235-
{
236-
mapped = slice[i];
237-
break;
238-
}
221+
if text != match_text && let Some(m) = re.find(match_text) {
222+
if let Some((_, map)) = resolved.as_ref() {
223+
let start = m.start();
224+
let end = m.end().min(map.len());
225+
if start < map.len() {
226+
let mut mapped = map[start];
227+
let slice = &map[start..end];
228+
for i in 0..slice.len() {
229+
let prev = i.checked_sub(1).map(|p| slice[p]);
230+
let next = slice.get(i + 1).copied();
231+
if prev == Some(slice[i])
232+
|| next == Some(slice[i])
233+
|| prev.is_some_and(|p| slice[i] != p + 1)
234+
{
235+
mapped = slice[i];
236+
break;
239237
}
240-
match_offset = Some(mapped);
241238
}
239+
match_offset = Some(mapped);
242240
}
243-
matched = true;
244-
break;
245241
}
242+
matched = true;
243+
break;
246244
}
247245
}
248246
if matched {
@@ -336,8 +334,10 @@ pub fn find_algorithms<'a>(
336334
if matches!(lang, Language::Swift)
337335
&& let Some(lib) = patterns.libraries.iter().find(|l| l.name == library_name)
338336
{
339-
let mut seen_on_line: HashSet<(&str, usize)> =
340-
result.iter().map(|hit| (hit.algorithm_name, hit.line)).collect();
337+
let mut seen_on_line: HashSet<(&str, usize)> = result
338+
.iter()
339+
.map(|hit| (hit.algorithm_name, hit.line))
340+
.collect();
341341
let present_algs: HashSet<&str> = result.iter().map(|hit| hit.algorithm_name).collect();
342342
for alg in &lib.algorithms {
343343
if present_algs.contains(alg.name.as_str()) {

0 commit comments

Comments
 (0)