diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-08-03 18:04:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-03 18:04:58 -0500 |
| commit | b1cfa783108f84b051fe8e4e4f02a484f919f147 (patch) | |
| tree | 9ee30a9c3f340e33a63980699c3941e3cf9ce304 /src/codegen/mod.rs | |
| parent | 4142a8969a82b54c592b0293ee04080edc41dd9d (diff) | |
| parent | 68f6adfea836150d1317212a8fb85c76e8c2e414 (diff) | |
Auto merge of #866 - photoszzt:can_derive_copy_array, r=fitzgen
Can derive copy analysis
r? @fitzgen or @emilio. Fix: #766
Diffstat (limited to 'src/codegen/mod.rs')
| -rw-r--r-- | src/codegen/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs index 637e3a65..5c00a53d 100644 --- a/src/codegen/mod.rs +++ b/src/codegen/mod.rs @@ -1424,7 +1424,7 @@ impl CodeGenerator for CompInfo { needs_default_impl = ctx.options().derive_default; } - if item.can_derive_copy(ctx, ()) && + if item.can_derive_copy(ctx) && !item.annotations().disallow_copy() { derives.push("Copy"); if used_template_params.is_some() { |