diff options
| -rw-r--r-- | crates/ide-assists/src/handlers/inline_type_alias.rs | 9 | ||||
| -rw-r--r-- | crates/rust-analyzer/tests/slow-tests/support.rs | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/crates/ide-assists/src/handlers/inline_type_alias.rs b/crates/ide-assists/src/handlers/inline_type_alias.rs index bc4a07358cc..d4d840f2236 100644 --- a/crates/ide-assists/src/handlers/inline_type_alias.rs +++ b/crates/ide-assists/src/handlers/inline_type_alias.rs @@ -7,13 +7,8 @@ use hir::{HasSource, PathResolution}; use itertools::Itertools; use std::collections::HashMap; use syntax::{ - ast::{ - self, - make::{self}, - HasGenericParams, HasName, - }, - ted::{self}, - AstNode, NodeOrToken, SyntaxNode, + ast::{self, make, HasGenericParams, HasName}, + ted, AstNode, NodeOrToken, SyntaxNode, }; use crate::{ diff --git a/crates/rust-analyzer/tests/slow-tests/support.rs b/crates/rust-analyzer/tests/slow-tests/support.rs index 36bffe3210e..2415abc1d82 100644 --- a/crates/rust-analyzer/tests/slow-tests/support.rs +++ b/crates/rust-analyzer/tests/slow-tests/support.rs @@ -360,7 +360,7 @@ fn find_mismatch<'a>(expected: &'a Value, actual: &'a Value) -> Option<(&'a Valu let l = sorted_values(l); let r = sorted_values(r); - l.into_iter().zip(r).filter_map(|(l, r)| find_mismatch(l, r)).next() + l.into_iter().zip(r).find_map(|(l, r)| find_mismatch(l, r)) } (Value::Null, Value::Null) => None, // magic string literal "{...}" acts as wildcard for any sub-JSON |