diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-27 03:58:26 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-09-27 03:58:26 +0100 |
| commit | 2b69c84396cf376b496e7de3c954400e51b5fc24 (patch) | |
| tree | 385a5a3cb167877096534bad2a7c3efdee3c9c1d /crates/ra_hir/src/marks.rs | |
| parent | fc218ec0d04577e33db509e956a044293c12ea67 (diff) | |
| parent | edadeb95be16a69175e94a0e211ae9bb74267abb (diff) | |
Merge #1815
1815: Support correct `$crate` expansion in macros r=uHOOCCOOHu a=uHOOCCOOHu
This PR makes normal use cases of `$crate` from macros work as expected.
It makes more macros from `std` work. Type inference works well with `panic`, `unimplemented`, `format`, and maybe more.
Sadly that `vec![1, 2, 3]` still not works, but it is not longer an issue about macro.
Screenshot:
Co-authored-by: uHOOCCOOHu <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/marks.rs')
| -rw-r--r-- | crates/ra_hir/src/marks.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crates/ra_hir/src/marks.rs b/crates/ra_hir/src/marks.rs index 125e0beea..0fed46802 100644 --- a/crates/ra_hir/src/marks.rs +++ b/crates/ra_hir/src/marks.rs | |||
| @@ -13,4 +13,6 @@ test_utils::marks!( | |||
| 13 | macro_rules_from_other_crates_are_visible_with_macro_use | 13 | macro_rules_from_other_crates_are_visible_with_macro_use |
| 14 | prelude_is_macro_use | 14 | prelude_is_macro_use |
| 15 | coerce_merge_fail_fallback | 15 | coerce_merge_fail_fallback |
| 16 | macro_dollar_crate_self | ||
| 17 | macro_dollar_crate_other | ||
| 16 | ); | 18 | ); |