diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-16 05:48:05 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-16 05:48:05 +0000 |
commit | 152f385055510c65bd94238878be23a258f5cc19 (patch) | |
tree | e8470eb83c1bc1283f0bb28ea01db789607a3140 /crates/hir_ty/src | |
parent | c0a2b4e826e1da20d3cfa8c279fcdffa24f32a7d (diff) | |
parent | 8e07b23b84bff16c0decc6f2b80c27862eac6df1 (diff) |
Merge #8044
8044: Fix macro expansion for statements w/o semicolon r=edwin0cheng a=edwin0cheng
Fixes #7845
And up `ungrammer` to 1.12.
cc @jonas-schievink
bors r+
Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates/hir_ty/src')
-rw-r--r-- | crates/hir_ty/src/tests/macros.rs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/crates/hir_ty/src/tests/macros.rs b/crates/hir_ty/src/tests/macros.rs index fb3afaedc..af4f8bb11 100644 --- a/crates/hir_ty/src/tests/macros.rs +++ b/crates/hir_ty/src/tests/macros.rs | |||
@@ -216,6 +216,22 @@ fn expr_macro_expanded_in_various_places() { | |||
216 | } | 216 | } |
217 | 217 | ||
218 | #[test] | 218 | #[test] |
219 | fn expr_macro_expanded_in_stmts() { | ||
220 | check_infer( | ||
221 | r#" | ||
222 | macro_rules! id { ($($es:tt)*) => { $($es)* } } | ||
223 | fn foo() { | ||
224 | id! { let a = (); } | ||
225 | } | ||
226 | "#, | ||
227 | expect![[r#" | ||
228 | !0..8 'leta=();': () | ||
229 | 57..84 '{ ...); } }': () | ||
230 | "#]], | ||
231 | ); | ||
232 | } | ||
233 | |||
234 | #[test] | ||
219 | fn infer_type_value_macro_having_same_name() { | 235 | fn infer_type_value_macro_having_same_name() { |
220 | check_infer( | 236 | check_infer( |
221 | r#" | 237 | r#" |