diff options
-rw-r--r-- | src/codegen/mod.rs | 2 | ||||
-rw-r--r-- | tests/expectations/tests/enum_and_vtable_mangling.rs | 2 | ||||
-rw-r--r-- | tests/expectations/tests/issue-1197-pure-virtual-stuff.rs | 4 | ||||
-rw-r--r-- | tests/expectations/tests/nested_vtable.rs | 3 | ||||
-rw-r--r-- | tests/expectations/tests/packed-vtable.rs | 2 | ||||
-rw-r--r-- | tests/expectations/tests/ref_argument_array.rs | 2 | ||||
-rw-r--r-- | tests/expectations/tests/virtual_dtor.rs | 2 | ||||
-rw-r--r-- | tests/expectations/tests/virtual_interface.rs | 6 | ||||
-rw-r--r-- | tests/expectations/tests/virtual_overloaded.rs | 4 | ||||
-rw-r--r-- | tests/expectations/tests/vtable_recursive_sig.rs | 2 |
10 files changed, 15 insertions, 14 deletions
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs index 2b10b3de..7a46f885 100644 --- a/src/codegen/mod.rs +++ b/src/codegen/mod.rs @@ -1082,7 +1082,7 @@ impl<'a> CodeGenerator for Vtable<'a> { }; Some(quote! { - #function_name : fn( #( #args ),* ) #ret + pub #function_name : fn( #( #args ),* ) #ret }) }) .collect::<Vec<_>>(); diff --git a/tests/expectations/tests/enum_and_vtable_mangling.rs b/tests/expectations/tests/enum_and_vtable_mangling.rs index c0414c37..126c40ba 100644 --- a/tests/expectations/tests/enum_and_vtable_mangling.rs +++ b/tests/expectations/tests/enum_and_vtable_mangling.rs @@ -15,7 +15,7 @@ pub enum _bindgen_ty_1 { } #[repr(C)] pub struct C__bindgen_vtable { - C_match: fn(this: &mut C), + pub C_match: fn(this: &mut C), } #[repr(C)] #[derive(Debug, Copy, Clone)] diff --git a/tests/expectations/tests/issue-1197-pure-virtual-stuff.rs b/tests/expectations/tests/issue-1197-pure-virtual-stuff.rs index 80606c2a..0b91eb24 100644 --- a/tests/expectations/tests/issue-1197-pure-virtual-stuff.rs +++ b/tests/expectations/tests/issue-1197-pure-virtual-stuff.rs @@ -7,8 +7,8 @@ #[repr(C)] pub struct Foo__bindgen_vtable { - Foo_Foo_destructor: fn(this: &mut Foo), - Foo_Bar: fn(this: &mut Foo), + pub Foo_Foo_destructor: fn(this: &mut Foo), + pub Foo_Bar: fn(this: &mut Foo), } #[repr(C)] #[derive(Debug)] diff --git a/tests/expectations/tests/nested_vtable.rs b/tests/expectations/tests/nested_vtable.rs index 2b0f2599..92651d45 100644 --- a/tests/expectations/tests/nested_vtable.rs +++ b/tests/expectations/tests/nested_vtable.rs @@ -7,7 +7,8 @@ #[repr(C)] pub struct nsISupports__bindgen_vtable { - nsISupports_QueryInterface: fn(this: &mut nsISupports) -> *mut nsISupports, + pub nsISupports_QueryInterface: + fn(this: &mut nsISupports) -> *mut nsISupports, } #[repr(C)] #[derive(Debug, Copy, Clone)] diff --git a/tests/expectations/tests/packed-vtable.rs b/tests/expectations/tests/packed-vtable.rs index 05fea619..33989101 100644 --- a/tests/expectations/tests/packed-vtable.rs +++ b/tests/expectations/tests/packed-vtable.rs @@ -8,7 +8,7 @@ #[repr(C)] pub struct PackedVtable__bindgen_vtable { - PackedVtable_PackedVtable_destructor: fn(this: &mut PackedVtable), + pub PackedVtable_PackedVtable_destructor: fn(this: &mut PackedVtable), } #[repr(C, packed)] #[derive(Debug)] diff --git a/tests/expectations/tests/ref_argument_array.rs b/tests/expectations/tests/ref_argument_array.rs index 04938d15..215fc5da 100644 --- a/tests/expectations/tests/ref_argument_array.rs +++ b/tests/expectations/tests/ref_argument_array.rs @@ -8,7 +8,7 @@ pub const NSID_LENGTH: u32 = 10; #[repr(C)] pub struct nsID__bindgen_vtable { - nsID_ToProvidedString: + pub nsID_ToProvidedString: fn(this: &mut nsID, aDest: *mut [::std::os::raw::c_char; 10usize]), } #[repr(C)] diff --git a/tests/expectations/tests/virtual_dtor.rs b/tests/expectations/tests/virtual_dtor.rs index 5af64bfe..5d8834fa 100644 --- a/tests/expectations/tests/virtual_dtor.rs +++ b/tests/expectations/tests/virtual_dtor.rs @@ -7,7 +7,7 @@ #[repr(C)] pub struct nsSlots__bindgen_vtable { - nsSlots_nsSlots_destructor: fn(this: &mut nsSlots), + pub nsSlots_nsSlots_destructor: fn(this: &mut nsSlots), } #[repr(C)] #[derive(Debug)] diff --git a/tests/expectations/tests/virtual_interface.rs b/tests/expectations/tests/virtual_interface.rs index ecd547fb..79656c28 100644 --- a/tests/expectations/tests/virtual_interface.rs +++ b/tests/expectations/tests/virtual_interface.rs @@ -7,8 +7,8 @@ #[repr(C)] pub struct PureVirtualIFace__bindgen_vtable { - PureVirtualIFace_Foo: fn(this: &mut PureVirtualIFace), - PureVirtualIFace_Bar: + pub PureVirtualIFace_Foo: fn(this: &mut PureVirtualIFace), + pub PureVirtualIFace_Bar: fn(this: &mut PureVirtualIFace, arg1: ::std::os::raw::c_uint), } #[repr(C)] @@ -40,7 +40,7 @@ impl Default for PureVirtualIFace { } #[repr(C)] pub struct AnotherInterface__bindgen_vtable { - AnotherInterface_Baz: fn(this: &mut AnotherInterface), + pub AnotherInterface_Baz: fn(this: &mut AnotherInterface), } #[repr(C)] #[derive(Debug, Copy, Clone)] diff --git a/tests/expectations/tests/virtual_overloaded.rs b/tests/expectations/tests/virtual_overloaded.rs index 771e08c0..f619f4ea 100644 --- a/tests/expectations/tests/virtual_overloaded.rs +++ b/tests/expectations/tests/virtual_overloaded.rs @@ -7,8 +7,8 @@ #[repr(C)] pub struct C__bindgen_vtable { - C_do_thing: fn(this: &mut C, arg1: ::std::os::raw::c_char), - C_do_thing1: fn(this: &mut C, arg1: ::std::os::raw::c_int), + pub C_do_thing: fn(this: &mut C, arg1: ::std::os::raw::c_char), + pub C_do_thing1: fn(this: &mut C, arg1: ::std::os::raw::c_int), } #[repr(C)] #[derive(Debug, Copy, Clone)] diff --git a/tests/expectations/tests/vtable_recursive_sig.rs b/tests/expectations/tests/vtable_recursive_sig.rs index c10f2f0f..f136c015 100644 --- a/tests/expectations/tests/vtable_recursive_sig.rs +++ b/tests/expectations/tests/vtable_recursive_sig.rs @@ -7,7 +7,7 @@ #[repr(C)] pub struct Base__bindgen_vtable { - Base_AsDerived: fn(this: &mut Base) -> *mut Derived, + pub Base_AsDerived: fn(this: &mut Base) -> *mut Derived, } #[repr(C)] #[derive(Debug, Copy, Clone)] |