From 6e8dedadcd65c7e21aaee3ec7c1fd6000558ca02 Mon Sep 17 00:00:00 2001
From: Mario Carneiro <di.gama@gmail.com>
Date: Mon, 30 Aug 2021 02:36:21 -0700
Subject: [PATCH 1/3] Fix error message
I'm not entirely sure if the message is still correct, it seems to have survived a number of refactors, but it is mangled english anyway.
---
crates/hir_expand/src/db.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crates/hir_expand/src/db.rs b/crates/hir_expand/src/db.rs
index e990d5fce6a..dc65cd1f3c6 100644
--- a/crates/hir_expand/src/db.rs
+++ b/crates/hir_expand/src/db.rs
@@ -366,7 +366,7 @@ fn macro_expand(db: &dyn AstDatabase, id: MacroCallId) -> ExpandResult<Option<Ar
let macro_arg = match db.macro_arg(id) {
Some(it) => it,
- None => return ExpandResult::str_err("Fail to args in to tt::TokenTree".into()),
+ None => return ExpandResult::str_err("Fail to lower args to token tree".into()),
};
let macro_rules = match db.macro_def(loc.def) {
From 2d349aed2e1585cfd526e645403011d25d6afe7c Mon Sep 17 00:00:00 2001
From: Mario Carneiro <di.gama@gmail.com>
Date: Mon, 30 Aug 2021 02:43:13 -0700
Subject: [PATCH 2/3] Update crates/hir_expand/src/db.rs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Laurențiu Nicola <lnicola@users.noreply.github.com>
---
crates/hir_expand/src/db.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crates/hir_expand/src/db.rs b/crates/hir_expand/src/db.rs
index dc65cd1f3c6..ac9a9001b4e 100644
--- a/crates/hir_expand/src/db.rs
+++ b/crates/hir_expand/src/db.rs
@@ -366,7 +366,7 @@ fn macro_expand(db: &dyn AstDatabase, id: MacroCallId) -> ExpandResult<Option<Ar
let macro_arg = match db.macro_arg(id) {
Some(it) => it,
- None => return ExpandResult::str_err("Fail to lower args to token tree".into()),
+ None => return ExpandResult::str_err("Fail to lower macro args to token tree".into()),
};
let macro_rules = match db.macro_def(loc.def) {
From b22eb02f8b152ae89f8bc21129258d1ed39e1f1f Mon Sep 17 00:00:00 2001
From: Mario Carneiro <di.gama@gmail.com>
Date: Mon, 30 Aug 2021 02:47:10 -0700
Subject: [PATCH 3/3] fail -> failed
---
crates/hir_expand/src/db.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/crates/hir_expand/src/db.rs b/crates/hir_expand/src/db.rs
index ac9a9001b4e..af98084f4c0 100644
--- a/crates/hir_expand/src/db.rs
+++ b/crates/hir_expand/src/db.rs
@@ -366,12 +366,12 @@ fn macro_expand(db: &dyn AstDatabase, id: MacroCallId) -> ExpandResult<Option<Ar
let macro_arg = match db.macro_arg(id) {
Some(it) => it,
- None => return ExpandResult::str_err("Fail to lower macro args to token tree".into()),
+ None => return ExpandResult::str_err("Failed to lower macro args to token tree".into()),
};
let macro_rules = match db.macro_def(loc.def) {
Some(it) => it,
- None => return ExpandResult::str_err("Fail to find macro definition".into()),
+ None => return ExpandResult::str_err("Failed to find macro definition".into()),
};
let ExpandResult { value: tt, err } = macro_rules.expand(db, id, ¯o_arg.0);
// Set a hard limit for the expanded tt