diff options
| author | bors <bors@rust-lang.org> | 2018-03-12 23:47:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-12 23:47:10 +0000 |
| commit | c7cbe142640b2cea1eeb385249faffcf49f0990d (patch) | |
| tree | 1a1177f544911d4739febbd995bddfc4c418edd9 /src/libsyntax_ext | |
| parent | 883e74645d350b6752cb94d48f46363f6f8789e9 (diff) | |
| parent | 99d0ac0b65452642e56619a84e2b83717ee35297 (diff) | |
| download | rust-c7cbe142640b2cea1eeb385249faffcf49f0990d.tar.gz rust-c7cbe142640b2cea1eeb385249faffcf49f0990d.zip | |
Auto merge of #48955 - kennytm:rollup, r=kennytm
Rollup of 13 pull requests - Successful merges: #48201, #48705, #48725, #48824, #48877, #48880, #48887, #48928, #48934, #48480, #48631, #48898, #48954 - Failed merges:
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/deriving/debug.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax_ext/deriving/debug.rs b/src/libsyntax_ext/deriving/debug.rs index 82fc09fca69..7b23de582a7 100644 --- a/src/libsyntax_ext/deriving/debug.rs +++ b/src/libsyntax_ext/deriving/debug.rs @@ -70,7 +70,7 @@ fn show_substructure(cx: &mut ExtCtxt, span: Span, substr: &Substructure) -> P<E // We want to make sure we have the ctxt set so that we can use unstable methods let span = span.with_ctxt(cx.backtrace()); let name = cx.expr_lit(span, ast::LitKind::Str(ident.name, ast::StrStyle::Cooked)); - let builder = Ident::from_str("builder"); + let builder = Ident::from_str("__debug_trait_builder"); let builder_expr = cx.expr_ident(span, builder.clone()); let fmt = substr.nonself_args[0].clone(); |