about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-08-19 23:35:25 +0300
committerPietro Albini <pietro@pietroalbini.org>2019-09-02 17:31:05 +0200
commit3d95d179373c08d5f26d014f35a76e06e18c41ed (patch)
tree14728493e1f63bdc6da0c2dba2466d93207e5a41 /src/test
parent1e77ef86b3725d567875ab93c8224f1774e5b40c (diff)
expand: Keep the correct current expansion ID for eager expansions
Solve the problem of `ParentScope` entries for eager expansions not exising in the resolver map by creating them on demand.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/hygiene/eager-from-opaque.stderr3
-rw-r--r--src/test/ui/macros/derive-in-eager-expansion-hang.stderr3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/test/ui/hygiene/eager-from-opaque.stderr b/src/test/ui/hygiene/eager-from-opaque.stderr
index 8db96e6ac95..f696e6caff7 100644
--- a/src/test/ui/hygiene/eager-from-opaque.stderr
+++ b/src/test/ui/hygiene/eager-from-opaque.stderr
@@ -3,6 +3,9 @@ error: cannot find macro `foo!` in this scope
    |
 LL |         foo!()
    |         ^^^
+...
+LL |     format_args!(bar!());
+   |                  ------ in this macro invocation
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/macros/derive-in-eager-expansion-hang.stderr b/src/test/ui/macros/derive-in-eager-expansion-hang.stderr
index 1ef9427666b..5ca4088e585 100644
--- a/src/test/ui/macros/derive-in-eager-expansion-hang.stderr
+++ b/src/test/ui/macros/derive-in-eager-expansion-hang.stderr
@@ -8,6 +8,9 @@ LL | |
 LL | |         ""
 LL | |     }
    | |_____^
+...
+LL |       format_args!(hang!());
+   |                    ------- in this macro invocation
 help: you might be missing a string literal to format with
    |
 LL |     format_args!("{}", hang!());