OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #25550 - sfackler:derive-debug-unsized, r=alexcrichton 

Closes #25394
This commit is contained in:
bors 2015-05-19 07:38:24 +00:00
parent b301e02f37 1973ee479d
commit 9c47ebb00a
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libsyntax/ext/deriving/show.rs
View File

@ -75,6 +75,7 @@ fn show_substructure(cx: &mut ExtCtxt, span: Span,
match *substr.fields {
Struct(ref fields) | EnumMatching(_, _, ref fields) => {
if fields.is_empty() || fields[0].name.is_none() {
// tuple struct/"normal" variant
expr = cx.expr_method_call(span,
@ -83,11 +84,14 @@ fn show_substructure(cx: &mut ExtCtxt, span: Span,
vec![name]);
for field in fields {
// Use double indirection to make sure this works for unsized types
let field = cx.expr_addr_of(field.span, field.self_.clone());
let field = cx.expr_addr_of(field.span, field);
expr = cx.expr_method_call(span,
expr,
token::str_to_ident("field"),
vec![cx.expr_addr_of(field.span,
field.self_.clone())]);
vec![field]);
}
} else {
// normal struct/struct variant
@ -100,12 +104,14 @@ fn show_substructure(cx: &mut ExtCtxt, span: Span,
let name = cx.expr_lit(field.span, ast::Lit_::LitStr(
token::get_ident(field.name.clone().unwrap()),
ast::StrStyle::CookedStr));
// Use double indirection to make sure this works for unsized types
let field = cx.expr_addr_of(field.span, field.self_.clone());
let field = cx.expr_addr_of(field.span, field);
expr = cx.expr_method_call(span,
expr,
token::str_to_ident("field"),
vec![name,
cx.expr_addr_of(field.span,
field.self_.clone())]);
vec![name, field]);
}
}
}

14
src/test/run-pass/issue-25394.rs Normal file
View File

@ -0,0 +1,14 @@
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#[derive(Debug)]
struct Row<T>([T]);
fn main() {}