aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Schievink <[email protected]>2021-05-19 19:23:26 +0100
committerJonas Schievink <[email protected]>2021-05-19 19:23:26 +0100
commitc0d93bc4d60d71fb6fec6e6c7305401f96ac18e8 (patch)
treefe7a3e29f122ae4eb6f1357002949f3487bf51a2
parentea8555b1552f6c08043f84885e47a196320da376 (diff)
Clarify field name
-rw-r--r--crates/hir_expand/src/builtin_macro.rs4
-rw-r--r--crates/hir_expand/src/db.rs2
-rw-r--r--crates/hir_expand/src/eager.rs4
-rw-r--r--crates/hir_expand/src/lib.rs2
4 files changed, 6 insertions, 6 deletions
diff --git a/crates/hir_expand/src/builtin_macro.rs b/crates/hir_expand/src/builtin_macro.rs
index 09ac16700..94d7aecb6 100644
--- a/crates/hir_expand/src/builtin_macro.rs
+++ b/crates/hir_expand/src/builtin_macro.rs
@@ -625,7 +625,7 @@ mod tests {
625 def, 625 def,
626 krate, 626 krate,
627 eager: Some(EagerCallInfo { 627 eager: Some(EagerCallInfo {
628 expansion: Arc::new(parsed_args.clone()), 628 arg_or_expansion: Arc::new(parsed_args.clone()),
629 included_file: None, 629 included_file: None,
630 }), 630 }),
631 kind: MacroCallKind::FnLike { ast_id: call_id, fragment: FragmentKind::Expr }, 631 kind: MacroCallKind::FnLike { ast_id: call_id, fragment: FragmentKind::Expr },
@@ -636,7 +636,7 @@ mod tests {
636 def, 636 def,
637 krate, 637 krate,
638 eager: Some(EagerCallInfo { 638 eager: Some(EagerCallInfo {
639 expansion: Arc::new(expanded.subtree), 639 arg_or_expansion: Arc::new(expanded.subtree),
640 included_file: expanded.included_file, 640 included_file: expanded.included_file,
641 }), 641 }),
642 kind: MacroCallKind::FnLike { ast_id: call_id, fragment: expanded.fragment }, 642 kind: MacroCallKind::FnLike { ast_id: call_id, fragment: expanded.fragment },
diff --git a/crates/hir_expand/src/db.rs b/crates/hir_expand/src/db.rs
index 7a82400a8..5c769c1bf 100644
--- a/crates/hir_expand/src/db.rs
+++ b/crates/hir_expand/src/db.rs
@@ -329,7 +329,7 @@ fn macro_expand_with_arg(
329 ); 329 );
330 } else { 330 } else {
331 return ExpandResult { 331 return ExpandResult {
332 value: Some(eager.expansion.clone()), 332 value: Some(eager.arg_or_expansion.clone()),
333 // FIXME: There could be errors here! 333 // FIXME: There could be errors here!
334 err: None, 334 err: None,
335 }; 335 };
diff --git a/crates/hir_expand/src/eager.rs b/crates/hir_expand/src/eager.rs
index 5e30ab930..e165b9c5f 100644
--- a/crates/hir_expand/src/eager.rs
+++ b/crates/hir_expand/src/eager.rs
@@ -122,7 +122,7 @@ pub fn expand_eager_macro(
122 def, 122 def,
123 krate, 123 krate,
124 eager: Some(EagerCallInfo { 124 eager: Some(EagerCallInfo {
125 expansion: Arc::new(parsed_args.clone()), 125 arg_or_expansion: Arc::new(parsed_args.clone()),
126 included_file: None, 126 included_file: None,
127 }), 127 }),
128 kind: MacroCallKind::FnLike { ast_id: call_id, fragment: FragmentKind::Expr }, 128 kind: MacroCallKind::FnLike { ast_id: call_id, fragment: FragmentKind::Expr },
@@ -149,7 +149,7 @@ pub fn expand_eager_macro(
149 def, 149 def,
150 krate, 150 krate,
151 eager: Some(EagerCallInfo { 151 eager: Some(EagerCallInfo {
152 expansion: Arc::new(expanded.subtree), 152 arg_or_expansion: Arc::new(expanded.subtree),
153 included_file: expanded.included_file, 153 included_file: expanded.included_file,
154 }), 154 }),
155 kind: MacroCallKind::FnLike { ast_id: call_id, fragment: expanded.fragment }, 155 kind: MacroCallKind::FnLike { ast_id: call_id, fragment: expanded.fragment },
diff --git a/crates/hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs
index edd5f9db2..b93c0c345 100644
--- a/crates/hir_expand/src/lib.rs
+++ b/crates/hir_expand/src/lib.rs
@@ -231,7 +231,7 @@ pub enum MacroDefKind {
231#[derive(Debug, Clone, PartialEq, Eq, Hash)] 231#[derive(Debug, Clone, PartialEq, Eq, Hash)]
232struct EagerCallInfo { 232struct EagerCallInfo {
233 /// NOTE: This can be *either* the expansion result, *or* the argument to the eager macro! 233 /// NOTE: This can be *either* the expansion result, *or* the argument to the eager macro!
234 expansion: Arc<tt::Subtree>, 234 arg_or_expansion: Arc<tt::Subtree>,
235 included_file: Option<FileId>, 235 included_file: Option<FileId>,
236} 236}
237 237