diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2018-06-23 21:41:39 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2018-06-23 21:53:24 +0300 |
| commit | 20ce91076af125eda82bb36e446e67b1c7af4218 (patch) | |
| tree | db4017fc25d2a0d413f70ed1186b6d7dfd45be4a /src/libsyntax_ext/deriving | |
| parent | 117cb040f14719489a38ace1c256ec282f42c367 (diff) | |
| download | rust-20ce91076af125eda82bb36e446e67b1c7af4218.tar.gz rust-20ce91076af125eda82bb36e446e67b1c7af4218.zip | |
hygiene: Merge `NameAndSpan` into `ExpnInfo`
Diffstat (limited to 'src/libsyntax_ext/deriving')
| -rw-r--r-- | src/libsyntax_ext/deriving/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax_ext/deriving/mod.rs b/src/libsyntax_ext/deriving/mod.rs index 6ff385b18e8..e6a1434ca9d 100644 --- a/src/libsyntax_ext/deriving/mod.rs +++ b/src/libsyntax_ext/deriving/mod.rs @@ -157,11 +157,11 @@ fn call_intrinsic(cx: &ExtCtxt, intrinsic: &str, args: Vec<P<ast::Expr>>) -> P<ast::Expr> { - if cx.current_expansion.mark.expn_info().unwrap().callee.allow_internal_unstable { + if cx.current_expansion.mark.expn_info().unwrap().allow_internal_unstable { span = span.with_ctxt(cx.backtrace()); } else { // Avoid instability errors with user defined curstom derives, cc #36316 let mut info = cx.current_expansion.mark.expn_info().unwrap(); - info.callee.allow_internal_unstable = true; + info.allow_internal_unstable = true; let mark = Mark::fresh(Mark::root()); mark.set_expn_info(info); span = span.with_ctxt(SyntaxContext::empty().apply_mark(mark)); |