diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-17 17:22:32 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-06-17 17:22:32 +0100 |
commit | ce926aebc4461e38535047958c0b6f72b7a0c0ea (patch) | |
tree | 4b844e0681b459836bac22c34bee43e4dfa3dc5f /crates/hir_def/src/nameres | |
parent | 3ae0c5911ab50ee209179ee4329b0551abe6fc48 (diff) | |
parent | 02d25ab60d2701ce71fe2dfaca36627ad902e229 (diff) |
Merge #9315
9315: Nest all the or-patterns! r=Veykril a=Veykril
`cargo +nightly clippy --fix -Z unstable-options --allow-dirty -- -A clippy::all -D clippy::unnested_or_patterns`
Co-authored-by: Lukas Wirth <[email protected]>
Diffstat (limited to 'crates/hir_def/src/nameres')
-rw-r--r-- | crates/hir_def/src/nameres/collector.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs index fc2c50fb8..927a7b6e8 100644 --- a/crates/hir_def/src/nameres/collector.rs +++ b/crates/hir_def/src/nameres/collector.rs | |||
@@ -1260,7 +1260,7 @@ impl DefCollector<'_> { | |||
1260 | for directive in &self.unresolved_imports { | 1260 | for directive in &self.unresolved_imports { |
1261 | if let ImportSource::Import { id: import, use_tree } = &directive.import.source { | 1261 | if let ImportSource::Import { id: import, use_tree } = &directive.import.source { |
1262 | match (directive.import.path.segments().first(), &directive.import.path.kind) { | 1262 | match (directive.import.path.segments().first(), &directive.import.path.kind) { |
1263 | (Some(krate), PathKind::Plain) | (Some(krate), PathKind::Abs) => { | 1263 | (Some(krate), PathKind::Plain | PathKind::Abs) => { |
1264 | if diagnosed_extern_crates.contains(krate) { | 1264 | if diagnosed_extern_crates.contains(krate) { |
1265 | continue; | 1265 | continue; |
1266 | } | 1266 | } |