diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-07-20 13:44:11 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-07-24 12:29:45 +0300 |
| commit | a0c2c640d54fa1622c2fea4accae1025bf109c47 (patch) | |
| tree | 4dd008fc2e23d15e8c1e3c7a69a8ec0c946b5fb6 /src/libsyntax_ext | |
| parent | 6e4f16173c331ca3ccae1ffecc5a69f1ad54f30c (diff) | |
| download | rust-a0c2c640d54fa1622c2fea4accae1025bf109c47.tar.gz rust-a0c2c640d54fa1622c2fea4accae1025bf109c47.zip | |
Fix rebase
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/global_allocator.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax_ext/global_allocator.rs b/src/libsyntax_ext/global_allocator.rs index 71c9e6cd23d..33072487e19 100644 --- a/src/libsyntax_ext/global_allocator.rs +++ b/src/libsyntax_ext/global_allocator.rs @@ -30,7 +30,7 @@ pub fn expand( }; // Generate a bunch of new items using the AllocFnFactory - let span = item.span.with_ctxt(SyntaxContext::empty().apply_mark(ecx.current_expansion.mark)); + let span = item.span.with_ctxt(SyntaxContext::empty().apply_mark(ecx.current_expansion.id)); let f = AllocFnFactory { span, kind: AllocatorKind::Global, |