diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-07-09 18:22:16 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-09 18:22:16 +0100 |
| commit | 5fc84f071d8fe1792db1f20bf735ec6b85a51a2f (patch) | |
| tree | 9cc123ba4b246b2c6f150bee3e39d8d6fd35505c /crates/ra_hir_expand/src/builtin_macro.rs | |
| parent | 1fb92d791e44d3b225f73d9160de173f255ab881 (diff) | |
| parent | 68706b59c9177db2a6dd276e1ce599d8fe5942c1 (diff) | |
Merge #5285
5285: Don't mess with cursor position when adding hashes r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_expand/src/builtin_macro.rs')
| -rw-r--r-- | crates/ra_hir_expand/src/builtin_macro.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir_expand/src/builtin_macro.rs b/crates/ra_hir_expand/src/builtin_macro.rs index 626f9efd0..9f50569dc 100644 --- a/crates/ra_hir_expand/src/builtin_macro.rs +++ b/crates/ra_hir_expand/src/builtin_macro.rs | |||
| @@ -272,7 +272,7 @@ fn format_args_expand( | |||
| 272 | fn unquote_str(lit: &tt::Literal) -> Option<String> { | 272 | fn unquote_str(lit: &tt::Literal) -> Option<String> { |
| 273 | let lit = ast::make::tokens::literal(&lit.to_string()); | 273 | let lit = ast::make::tokens::literal(&lit.to_string()); |
| 274 | let token = ast::String::cast(lit)?; | 274 | let token = ast::String::cast(lit)?; |
| 275 | token.value() | 275 | token.value().map(|it| it.into_owned()) |
| 276 | } | 276 | } |
| 277 | 277 | ||
| 278 | fn concat_expand( | 278 | fn concat_expand( |