Move api module into platform::linux

src/api/mod.rs

@@ -1,5 +0,0 @@
-// TODO: remove this module altogether and move all implementations to `platform`
-
-pub mod dlopen;
-pub mod wayland;
-pub mod x11;

src/lib.rs

@@ -128,7 +128,6 @@ pub use native_monitor::NativeMonitorId;
 #[macro_use]
 mod api_transition;
 
-mod api;
 mod platform;
 mod events;
 mod window;

src/os/unix.rs

@@ -7,14 +7,12 @@ use Window;
 use platform::Window as LinuxWindow;
 use platform::{UnixBackend, UNIX_BACKEND};
 use WindowBuilder;
-use api::x11::XConnection;
+use platform::x11::XConnection;
-use api::x11::ffi::XVisualInfo;
+use platform::x11::ffi::XVisualInfo;
 
 use wayland_client::protocol::wl_display::WlDisplay;
 use wayland_client::protocol::wl_surface::WlSurface;
 
-pub use api::x11;
-
 // TODO: do not expose XConnection
 pub fn get_x11_xconnection() -> Option<Arc<XConnection>> {
     match *UNIX_BACKEND {

src/platform/linux/mod.rs

@@ -10,12 +10,15 @@ use MouseCursor;
 use WindowAttributes;
 use libc;
 
-use api::wayland;
+use self::x11::XConnection;
-use api::x11;
+use self::x11::XError;
-use api::x11::XConnection;
+use self::x11::XNotSupported;
-use api::x11::XError;
+use self::x11::ffi::XVisualInfo;
-use api::x11::XNotSupported;
+
-use api::x11::ffi::XVisualInfo;
+mod dlopen;
+pub mod wayland;
+pub mod x11;
+
 
 gen_api_transition!();
 

src/platform/linux/x11/xdisplay.rs

@@ -7,7 +7,7 @@ use std::sync::Mutex;
 use libc;
 
 use super::ffi;
-use api::dlopen;
+use super::super::dlopen;
 
 /// A connection to an X server.
 pub struct XConnection {