From e55a44a831477e2fc8e11340c3d91db883b97c8e Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Sat, 14 Nov 2020 17:49:36 +0100
Subject: Use shorthand record syntax when renaming struct initializer field
---
crates/syntax/src/ast/expr_ext.rs | 12 ++++++++++++
crates/syntax/src/ast/node_ext.rs | 10 +---------
2 files changed, 13 insertions(+), 9 deletions(-)
(limited to 'crates/syntax/src')
diff --git a/crates/syntax/src/ast/expr_ext.rs b/crates/syntax/src/ast/expr_ext.rs
index 9253c97d0..e4a9b945c 100644
--- a/crates/syntax/src/ast/expr_ext.rs
+++ b/crates/syntax/src/ast/expr_ext.rs
@@ -22,6 +22,18 @@ impl ast::Expr {
_ => false,
}
}
+
+ pub fn name_ref(&self) -> Option<ast::NameRef> {
+ if let ast::Expr::PathExpr(expr) = self {
+ let path = expr.path()?;
+ let segment = path.segment()?;
+ let name_ref = segment.name_ref()?;
+ if path.qualifier().is_none() {
+ return Some(name_ref);
+ }
+ }
+ None
+ }
}
#[derive(Debug, Clone, PartialEq, Eq)]
diff --git a/crates/syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs
index ce35ac01a..b70b840b8 100644
--- a/crates/syntax/src/ast/node_ext.rs
+++ b/crates/syntax/src/ast/node_ext.rs
@@ -203,15 +203,7 @@ impl ast::RecordExprField {
if let Some(name_ref) = self.name_ref() {
return Some(name_ref);
}
- if let Some(ast::Expr::PathExpr(expr)) = self.expr() {
- let path = expr.path()?;
- let segment = path.segment()?;
- let name_ref = segment.name_ref()?;
- if path.qualifier().is_none() {
- return Some(name_ref);
- }
- }
- None
+ self.expr()?.name_ref()
}
}
--
cgit v1.2.3