diff options
| author | bors <bors@rust-lang.org> | 2019-09-09 16:33:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-09 16:33:43 +0000 |
| commit | 0b36e9dea3f2ff25b1d0df2669836c33cce89ae5 (patch) | |
| tree | e5e45ef04b46bdba8f8959029e7da415a58b0983 /src/libsyntax_ext | |
| parent | 45859b7ca764cafb14efb8c63a83d5e48dc5d016 (diff) | |
| parent | f7ee13040b66c323359c8aea139ba4d91db84376 (diff) | |
| download | rust-0b36e9dea3f2ff25b1d0df2669836c33cce89ae5.tar.gz rust-0b36e9dea3f2ff25b1d0df2669836c33cce89ae5.zip | |
Auto merge of #64313 - Centril:rollup-7w8b67g, r=Centril
Rollup of 5 pull requests
Successful merges:
- #63468 (Resolve attributes in several places)
- #64121 (Override `StepBy::{try_fold, try_rfold}`)
- #64278 (check git in bootstrap.py)
- #64306 (Fix typo in config.toml.example)
- #64312 (Unify escape usage)
Failed merges:
r? @ghost
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index 893d89f06a1..c53fa7dc706 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -1620,6 +1620,7 @@ impl<'a> TraitDef<'a> { id: ast::DUMMY_NODE_ID, span: pat.span.with_ctxt(self.span.ctxt()), pat, + is_placeholder: false } }) .collect(); |