diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-10-27 09:08:15 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-10-27 15:12:47 -0700 |
| commit | 20b9897c58c15ce7150f542a4a1beac5a5c70144 (patch) | |
| tree | fc745404dbde02c6599fe6051f600ba6323657dc /src/libsyntax | |
| parent | c381752b0eed42bfac2ef6f91fc1ab0b31ce7f3d (diff) | |
| parent | e5f709079a2f9c5227e10f5f4cd0371a2fd76ae3 (diff) | |
| download | rust-20b9897c58c15ce7150f542a4a1beac5a5c70144.tar.gz rust-20b9897c58c15ce7150f542a4a1beac5a5c70144.zip | |
rollup merge of #18362 : kevinmehall/pprint-struct-pat-shorthand
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/deriving/generic/mod.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/print/pprust.rs | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/libsyntax/ext/deriving/generic/mod.rs b/src/libsyntax/ext/deriving/generic/mod.rs index 533a28998bd..7c32b845508 100644 --- a/src/libsyntax/ext/deriving/generic/mod.rs +++ b/src/libsyntax/ext/deriving/generic/mod.rs @@ -1250,7 +1250,7 @@ impl<'a> TraitDef<'a> { // id is guaranteed to be Some codemap::Spanned { span: pat.span, - node: ast::FieldPat { ident: id.unwrap(), pat: pat, is_shorthand: true }, + node: ast::FieldPat { ident: id.unwrap(), pat: pat, is_shorthand: false }, } }).collect(); cx.pat_struct(self.span, matching_path, field_pats) diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index de60e6cd276..69e6d78d16a 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1997,8 +1997,10 @@ impl<'a> State<'a> { Consistent, fields.as_slice(), |s, f| { try!(s.cbox(indent_unit)); - try!(s.print_ident(f.node.ident)); - try!(s.word_nbsp(":")); + if !f.node.is_shorthand { + try!(s.print_ident(f.node.ident)); + try!(s.word_nbsp(":")); + } try!(s.print_pat(&*f.node.pat)); s.end() }, |