From fbc5da76a0b2715504d25506b4a80473eb25d405 Mon Sep 17 00:00:00 2001 From: Jethro Beekman Date: Thu, 21 Mar 2019 00:15:20 -0700 Subject: Unify derive logic --- src/codegen/impl_debug.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/codegen/impl_debug.rs') diff --git a/src/codegen/impl_debug.rs b/src/codegen/impl_debug.rs index d429e328..fd486511 100644 --- a/src/codegen/impl_debug.rs +++ b/src/codegen/impl_debug.rs @@ -1,6 +1,5 @@ use ir::comp::{BitfieldUnit, CompKind, Field, FieldData, FieldMethods}; use ir::context::BindgenContext; -use ir::derive::CanTriviallyDeriveDebug; use ir::item::{HasTypeParamInArray, IsOpaque, Item, ItemCanonicalName}; use ir::ty::{RUST_DERIVE_IN_ARRAY_LIMIT, TypeKind}; use proc_macro2; @@ -236,7 +235,7 @@ impl<'a> ImplDebug<'a> for Item { let inner_type = ctx.resolve_type(inner).canonical_type(ctx); match *inner_type.kind() { TypeKind::Function(ref sig) - if !sig.can_trivially_derive_debug(ctx) => { + if !sig.function_pointers_can_derive() => { Some((format!("{}: FunctionPointer", name), vec![])) } _ => debug_print(name, quote! { #name_ident }), -- cgit v1.2.3