Merge #7326

bors[bot] · kevaundray · web-flow · commit fcc109e8904a · 2021-01-18T17:40:11.000Z
7326: Use `is_ident` when converting Path to an Identifier r=edwin0cheng a=kevaundray



Co-authored-by: Kevaundray Wedderburn &lt;kevtheappdev@gmail.com&gt;
diff --git a/crates/hir_def/src/path.rs b/crates/hir_def/src/path.rs
@@ -87,7 +87,7 @@ 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 {
+        if !self.is_ident() {
             return None;
         }
         self.segments.first()

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ impl ModPath {`
`87`	`87`
`88`	`88`	/// If this path is a single identifier, like `foo`, return its name.
`89`	`89`	`pub fn as_ident(&self) -> Option<&Name> {`
`90`		`- if self.kind != PathKind::Plain \|\| self.segments.len() > 1 {`
	`90`	`+ if !self.is_ident() {`
`91`	`91`	`return None;`
`92`	`92`	`}`
`93`	`93`	`self.segments.first()`