From 9559742e197264eb2416c3d5e354c935035671e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Tue, 1 May 2018 17:30:02 +0300
Subject: [PATCH] Clean up module exports/re-exports

---
 gobject-subclass/src/guard.rs | 4 ++--
 gobject-subclass/src/lib.rs   | 5 ++---
 gst-plugin/src/lib.rs         | 5 +++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gobject-subclass/src/guard.rs b/gobject-subclass/src/guard.rs
index ffac3021..2a61a26b 100644
--- a/gobject-subclass/src/guard.rs
+++ b/gobject-subclass/src/guard.rs
@@ -14,14 +14,14 @@ use gobject_ffi;
 #[macro_export]
 macro_rules! callback_guard {
     () => {
-        let _guard = ::glib::CallbackGuard::new();
+        let _guard = $crate::glib::CallbackGuard::new();
     };
 }
 
 #[macro_export]
 macro_rules! floating_reference_guard {
     ($obj:ident) => {
-        let _guard = $crate::FloatingReferenceGuard::new($obj as *mut _);
+        let _guard = $crate::guard::FloatingReferenceGuard::new($obj as *mut _);
     };
 }
 
diff --git a/gobject-subclass/src/lib.rs b/gobject-subclass/src/lib.rs
index 1e691bbc..e8dfc90f 100644
--- a/gobject-subclass/src/lib.rs
+++ b/gobject-subclass/src/lib.rs
@@ -6,8 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-pub extern crate glib_sys as glib_ffi;
-pub extern crate gobject_sys as gobject_ffi;
+extern crate glib_sys as glib_ffi;
+extern crate gobject_sys as gobject_ffi;
 
 extern crate libc;
 
@@ -18,7 +18,6 @@ pub mod anyimpl;
 
 #[macro_use]
 pub mod guard;
-pub use guard::FloatingReferenceGuard;
 
 pub mod properties;
 #[macro_use]
diff --git a/gst-plugin/src/lib.rs b/gst-plugin/src/lib.rs
index 77d3fb73..68d40da4 100644
--- a/gst-plugin/src/lib.rs
+++ b/gst-plugin/src/lib.rs
@@ -6,12 +6,13 @@
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-
 extern crate byteorder;
+
 pub extern crate glib_sys as glib_ffi;
 pub extern crate gobject_sys as gobject_ffi;
-extern crate gstreamer_base_sys as gst_base_ffi;
 pub extern crate gstreamer_sys as gst_ffi;
+extern crate gstreamer_base_sys as gst_base_ffi;
+
 #[macro_use]
 extern crate lazy_static;
 extern crate libc;