diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-21 16:11:21 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-06-21 16:11:21 +0100 |
commit | 56e61bdfea5454dec4408a4947e037bcd042c886 (patch) | |
tree | 0bc42cbfcf5b6b502ad9fc3079cb4bdc5e8f110f /crates/hir_def/src/resolver.rs | |
parent | 25bf451c8426a68ecfdc3a1d1be1db9702dd41d8 (diff) | |
parent | 47747cd4120e260a144242aadd7732e11d133fe4 (diff) |
Merge #9165
9165: Apply some clippy suggestions r=matklad a=clemenswasser
Co-authored-by: Clemens Wasser <[email protected]>
Diffstat (limited to 'crates/hir_def/src/resolver.rs')
-rw-r--r-- | crates/hir_def/src/resolver.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/hir_def/src/resolver.rs b/crates/hir_def/src/resolver.rs index 49c573087..a11439c3b 100644 --- a/crates/hir_def/src/resolver.rs +++ b/crates/hir_def/src/resolver.rs | |||
@@ -388,9 +388,9 @@ impl Resolver { | |||
388 | self.module_scope().map(|t| t.0.krate()) | 388 | self.module_scope().map(|t| t.0.krate()) |
389 | } | 389 | } |
390 | 390 | ||
391 | pub fn where_predicates_in_scope<'a>( | 391 | pub fn where_predicates_in_scope( |
392 | &'a self, | 392 | &self, |
393 | ) -> impl Iterator<Item = &'a crate::generics::WherePredicate> + 'a { | 393 | ) -> impl Iterator<Item = &crate::generics::WherePredicate> { |
394 | self.scopes | 394 | self.scopes |
395 | .iter() | 395 | .iter() |
396 | .rev() | 396 | .rev() |
@@ -464,16 +464,16 @@ impl Scope { | |||
464 | &Scope::GenericParams { ref params, def: parent } => { | 464 | &Scope::GenericParams { ref params, def: parent } => { |
465 | for (local_id, param) in params.types.iter() { | 465 | for (local_id, param) in params.types.iter() { |
466 | if let Some(ref name) = param.name { | 466 | if let Some(ref name) = param.name { |
467 | let id = TypeParamId { local_id, parent }; | 467 | let id = TypeParamId { parent, local_id }; |
468 | f(name.clone(), ScopeDef::GenericParam(id.into())) | 468 | f(name.clone(), ScopeDef::GenericParam(id.into())) |
469 | } | 469 | } |
470 | } | 470 | } |
471 | for (local_id, param) in params.consts.iter() { | 471 | for (local_id, param) in params.consts.iter() { |
472 | let id = ConstParamId { local_id, parent }; | 472 | let id = ConstParamId { parent, local_id }; |
473 | f(param.name.clone(), ScopeDef::GenericParam(id.into())) | 473 | f(param.name.clone(), ScopeDef::GenericParam(id.into())) |
474 | } | 474 | } |
475 | for (local_id, param) in params.lifetimes.iter() { | 475 | for (local_id, param) in params.lifetimes.iter() { |
476 | let id = LifetimeParamId { local_id, parent }; | 476 | let id = LifetimeParamId { parent, local_id }; |
477 | f(param.name.clone(), ScopeDef::GenericParam(id.into())) | 477 | f(param.name.clone(), ScopeDef::GenericParam(id.into())) |
478 | } | 478 | } |
479 | } | 479 | } |