Unnamed repository; edit this file 'description' to name the repository.
minor: Remove either dependency from `ide_completion`
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | crates/ide_completion/Cargo.toml | 1 | ||||
| -rw-r--r-- | crates/ide_completion/src/completions/dot.rs | 35 |
3 files changed, 19 insertions, 18 deletions
diff --git a/Cargo.lock b/Cargo.lock index 1937b89362..38d1d0cd6a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -641,7 +641,6 @@ version = "0.0.0" dependencies = [ "base_db", "cov-mark", - "either", "expect-test", "hir", "ide_db", diff --git a/crates/ide_completion/Cargo.toml b/crates/ide_completion/Cargo.toml index e088e3815a..8d9381e09a 100644 --- a/crates/ide_completion/Cargo.toml +++ b/crates/ide_completion/Cargo.toml @@ -13,7 +13,6 @@ doctest = false cov-mark = "2.0.0-pre.1" itertools = "0.10.3" rustc-hash = "1.1.0" -either = "1.6.1" once_cell = "1.10.0" smallvec = "1.8.0" diff --git a/crates/ide_completion/src/completions/dot.rs b/crates/ide_completion/src/completions/dot.rs index c237a65bfe..9eb9da1b1b 100644 --- a/crates/ide_completion/src/completions/dot.rs +++ b/crates/ide_completion/src/completions/dot.rs @@ -1,6 +1,5 @@ //! Completes references after dot (fields and method calls). -use either::Either; use rustc_hash::FxHashSet; use crate::{context::CompletionContext, patterns::ImmediateLocation, Completions}; @@ -20,10 +19,13 @@ pub(crate) fn complete_dot(acc: &mut Completions, ctx: &CompletionContext) { if matches!(ctx.completion_location, Some(ImmediateLocation::MethodCall { .. })) { cov_mark::hit!(test_no_struct_field_completion_for_method_call); } else { - complete_fields(ctx, &receiver_ty, |field, ty| match field { - Either::Left(field) => acc.add_field(ctx, None, field, &ty), - Either::Right(tuple_idx) => acc.add_tuple_field(ctx, None, tuple_idx, &ty), - }); + complete_fields( + acc, + ctx, + &receiver_ty, + |acc, field, ty| acc.add_field(ctx, None, field, &ty), + |acc, field, ty| acc.add_tuple_field(ctx, None, field, &ty), + ); } complete_methods(ctx, &receiver_ty, |func| acc.add_method(ctx, func, None, None)); } @@ -38,14 +40,13 @@ fn complete_undotted_self(acc: &mut Completions, ctx: &CompletionContext) { if let Some(func) = ctx.function_def.as_ref().and_then(|fn_| ctx.sema.to_def(fn_)) { if let Some(self_) = func.self_param(ctx.db) { let ty = self_.ty(ctx.db); - complete_fields(ctx, &ty, |field, ty| match field { - either::Either::Left(field) => { - acc.add_field(ctx, Some(hir::known::SELF_PARAM), field, &ty) - } - either::Either::Right(tuple_idx) => { - acc.add_tuple_field(ctx, Some(hir::known::SELF_PARAM), tuple_idx, &ty) - } - }); + complete_fields( + acc, + ctx, + &ty, + |acc, field, ty| acc.add_field(ctx, Some(hir::known::SELF_PARAM), field, &ty), + |acc, field, ty| acc.add_tuple_field(ctx, Some(hir::known::SELF_PARAM), field, &ty), + ); complete_methods(ctx, &ty, |func| { acc.add_method(ctx, func, Some(hir::known::SELF_PARAM), None) }); @@ -54,17 +55,19 @@ fn complete_undotted_self(acc: &mut Completions, ctx: &CompletionContext) { } fn complete_fields( + acc: &mut Completions, ctx: &CompletionContext, receiver: &hir::Type, - mut f: impl FnMut(Either<hir::Field, usize>, hir::Type), + mut named_field: impl FnMut(&mut Completions, hir::Field, hir::Type), + mut tuple_index: impl FnMut(&mut Completions, usize, hir::Type), ) { for receiver in receiver.autoderef(ctx.db) { for (field, ty) in receiver.fields(ctx.db) { - f(Either::Left(field), ty); + named_field(acc, field, ty); } for (i, ty) in receiver.tuple_fields(ctx.db).into_iter().enumerate() { // Tuple fields are always public (tuple struct fields are handled above). - f(Either::Right(i), ty); + tuple_index(acc, i, ty); } } } |