Auto merge of #17464 - wyatt-herkamp:fix-actix-macro, r=lnicola
Check that Expr is none before adding fixup
Closes #17463
diff --git a/crates/hir-expand/src/fixup.rs b/crates/hir-expand/src/fixup.rs
index eadb2e1..9fdf4aa 100644
--- a/crates/hir-expand/src/fixup.rs
+++ b/crates/hir-expand/src/fixup.rs
@@ -277,7 +277,7 @@
},
ast::RecordExprField(it) => {
if let Some(colon) = it.colon_token() {
- if it.name_ref().is_some() {
+ if it.name_ref().is_some() && it.expr().is_none() {
append.insert(colon.into(), vec![
Leaf::Ident(Ident {
text: "__ra_fixup".into(),
@@ -844,6 +844,20 @@
}
#[test]
+ fn no_fixup_record_ctor_field() {
+ check(
+ r#"
+fn foo() {
+ R { f: a }
+}
+"#,
+ expect![[r#"
+fn foo () {R {f : a}}
+"#]],
+ )
+ }
+
+ #[test]
fn fixup_arg_list() {
check(
r#"