diff options
author | arsdragonfly <[email protected]> | 2019-09-27 21:17:23 +0100 |
---|---|---|
committer | arsdragonfly <[email protected]> | 2019-09-27 21:17:23 +0100 |
commit | 84340db87aed477f61bf46ba5e4a75f3eb672237 (patch) | |
tree | af7fe4eb8045ccb1b73bcdcd80b3a729062bd308 /crates/ra_mbe/src | |
parent | d1988a17f4ceb90bcdaed79072c4b7f647c86854 (diff) | |
parent | 21fa889cf3f70c507e3b9f2f6362e65cbb8ed955 (diff) |
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer
Diffstat (limited to 'crates/ra_mbe/src')
-rw-r--r-- | crates/ra_mbe/src/mbe_expander/transcriber.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_mbe/src/mbe_expander/transcriber.rs b/crates/ra_mbe/src/mbe_expander/transcriber.rs index c22680b93..ed094d5bb 100644 --- a/crates/ra_mbe/src/mbe_expander/transcriber.rs +++ b/crates/ra_mbe/src/mbe_expander/transcriber.rs | |||
@@ -86,7 +86,7 @@ fn expand_subtree(ctx: &mut ExpandCtx, template: &tt::Subtree) -> Result<tt::Sub | |||
86 | 86 | ||
87 | fn expand_var(ctx: &mut ExpandCtx, v: &SmolStr) -> Result<Fragment, ExpandError> { | 87 | fn expand_var(ctx: &mut ExpandCtx, v: &SmolStr) -> Result<Fragment, ExpandError> { |
88 | let res = if v == "crate" { | 88 | let res = if v == "crate" { |
89 | // FIXME: Properly handle $crate token | 89 | // We simply produce identifier `$crate` here. And it will be resolved when lowering ast to Path. |
90 | let tt = | 90 | let tt = |
91 | tt::Leaf::from(tt::Ident { text: "$crate".into(), id: tt::TokenId::unspecified() }) | 91 | tt::Leaf::from(tt::Ident { text: "$crate".into(), id: tt::TokenId::unspecified() }) |
92 | .into(); | 92 | .into(); |