Fix conflict for re-exports

Author: GuillaumeGomez

glib/src/lib.rs

@@ -131,8 +131,8 @@ pub mod closure;
 mod convert;
 pub use self::convert::*;
 mod enums;
-mod functions;
-pub use self::functions::*;
+mod manual_functions;
+pub use self::manual_functions::*;
 mod key_file;
 pub mod prelude;
 pub mod signal;

glib/src/functions.rs glib/src/manual_functions.rsglib/src/functions.rs renamed to glib/src/manual_functions.rs

@@ -8,7 +8,11 @@ error[E0277]: `*mut c_void` cannot be sent between threads safely
   |
   = help: the trait `Send` is not implemented for `*mut c_void`
   = note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
-  = note: required because it appears within the type `Object`
+note: required because it appears within the type `Object`
+ --> src/object.rs
+  |
+  |     pub Object, *mut std::os::raw::c_void, (), gobject_ffi::GObject, @ffi_class gobject_ffi::GObjectClass, @type_ gobject_ffi::g_object_g...
+  |         ^^^^^^
 note: required by a bound in `main::check`
  --> tests/subclass_compiletest/03-object-no-auto-send-sync.rs:2:17
   |
@@ -25,7 +29,11 @@ error[E0277]: `*mut c_void` cannot be shared between threads safely
   |
   = help: the trait `Sync` is not implemented for `*mut c_void`
   = note: required for `TypedObjectRef<*mut c_void, ()>` to implement `Send`
-  = note: required because it appears within the type `Object`
+note: required because it appears within the type `Object`
+ --> src/object.rs
+  |
+  |     pub Object, *mut std::os::raw::c_void, (), gobject_ffi::GObject, @ffi_class gobject_ffi::GObjectClass, @type_ gobject_ffi::g_object_g...
+  |         ^^^^^^
 note: required by a bound in `main::check`
  --> tests/subclass_compiletest/03-object-no-auto-send-sync.rs:2:17
   |

glib/tests/subclass_compiletest/03-object-no-auto-send-sync.stderr

@@ -12,7 +12,7 @@ pub use glib;
 mod auto;
 pub use crate::{
     auto::{functions::*, *},
-    functions::*,
+    manual_functions::*,
 };
 
 #[doc(alias = "PANGO_SCALE")]
@@ -97,8 +97,8 @@ mod color;
 mod coverage;
 pub use coverage::Coverage;
 mod enums;
-mod functions;
 mod glyph_geometry;
+mod manual_functions;
 pub use glyph_geometry::GlyphGeometry;
 mod glyph_info;
 pub use glyph_info::GlyphInfo;