From 725c20e8c51aa84a52bbfa96dca7bd999681b541 Mon Sep 17 00:00:00 2001 From: Kevaundray Wedderburn Date: Mon, 18 Jan 2021 16:54:07 +0000 Subject: [PATCH 1/2] use `is_ident` method --- crates/hir_def/src/path.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/hir_def/src/path.rs b/crates/hir_def/src/path.rs index e2bf85bbc3..61b64f70e0 100644 --- a/crates/hir_def/src/path.rs +++ b/crates/hir_def/src/path.rs @@ -87,8 +87,8 @@ impl ModPath { /// If this path is a single identifier, like `foo`, return its name. pub fn as_ident(&self) -> Option<&Name> { - if self.kind != PathKind::Plain || self.segments.len() > 1 { - return None; + if !self.is_ident() { + return None } self.segments.first() } From da104bb0f57b061547860184cb81c507f50f9f8e Mon Sep 17 00:00:00 2001 From: Kevaundray Wedderburn Date: Mon, 18 Jan 2021 16:58:29 +0000 Subject: [PATCH 2/2] cargo fmt --- crates/hir_def/src/path.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/hir_def/src/path.rs b/crates/hir_def/src/path.rs index 61b64f70e0..a99f738829 100644 --- a/crates/hir_def/src/path.rs +++ b/crates/hir_def/src/path.rs @@ -88,7 +88,7 @@ impl ModPath { /// If this path is a single identifier, like `foo`, return its name. pub fn as_ident(&self) -> Option<&Name> { if !self.is_ident() { - return None + return None; } self.segments.first() }