diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-21 06:12:36 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-12-21 06:12:36 +0000 |
commit | 1cbef27ff857803fbee123e6730b83e1ef154f6c (patch) | |
tree | 7d45ce377fb8f4c7019bb74381228b94f397110f /crates/ra_hir_def/src | |
parent | 6eab968c601637361e8fbd1ee93ded1b0d967bee (diff) | |
parent | 0d5d63a80ea08f2af439bcc72fff9b24d144c70d (diff) |
Merge #2625
2625: Clippy lints r=matklad a=kjeremy
Co-authored-by: kjeremy <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src')
-rw-r--r-- | crates/ra_hir_def/src/nameres/collector.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs index 8b641d8b5..45199fa11 100644 --- a/crates/ra_hir_def/src/nameres/collector.rs +++ b/crates/ra_hir_def/src/nameres/collector.rs | |||
@@ -399,14 +399,14 @@ where | |||
399 | let resolutions = enum_data | 399 | let resolutions = enum_data |
400 | .variants | 400 | .variants |
401 | .iter() | 401 | .iter() |
402 | .filter_map(|(local_id, variant_data)| { | 402 | .map(|(local_id, variant_data)| { |
403 | let name = variant_data.name.clone(); | 403 | let name = variant_data.name.clone(); |
404 | let variant = EnumVariantId { parent: e, local_id }; | 404 | let variant = EnumVariantId { parent: e, local_id }; |
405 | let res = Resolution { | 405 | let res = Resolution { |
406 | def: PerNs::both(variant.into(), variant.into()), | 406 | def: PerNs::both(variant.into(), variant.into()), |
407 | import: Some(import_id), | 407 | import: Some(import_id), |
408 | }; | 408 | }; |
409 | Some((name, res)) | 409 | (name, res) |
410 | }) | 410 | }) |
411 | .collect::<Vec<_>>(); | 411 | .collect::<Vec<_>>(); |
412 | self.update(module_id, Some(import_id), &resolutions); | 412 | self.update(module_id, Some(import_id), &resolutions); |