🚚 zb: move ::raw under ::connection

dbus2 · Jul 30, 2023 · 4bfe68c · 4bfe68c
1 parent 3e442f7
commit 4bfe68c
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 16 deletions.
diff --git a/zbus/src/connection/builder.rs b/zbus/src/connection/builder.rs
@@ -29,11 +29,13 @@ use crate::{
     async_lock::RwLock,
     names::{InterfaceName, UniqueName, WellKnownName},
     object_server::Interface,
-    raw::Socket,
     Connection, Error, Executor, Guid, Result,
 };
 
-use super::handshake::{AuthMechanism, Authenticated};
+use super::{
+    handshake::{AuthMechanism, Authenticated},
+    raw::Socket,
+};
 
 const DEFAULT_MAX_QUEUED: usize = 64;
 

diff --git a/zbus/src/connection/handshake.rs b/zbus/src/connection/handshake.rs
@@ -18,12 +18,9 @@ use xdg_home::home_dir;
 
 #[cfg(windows)]
 use crate::win32;
-use crate::{
-    file::FileLines,
-    guid::Guid,
-    raw::{Connection, Socket},
-    Error, Result,
-};
+use crate::{file::FileLines, guid::Guid, Error, Result};
+
+use super::raw::{Connection, Socket};
 
 /// Authentication mechanisms
 ///

diff --git a/zbus/src/connection/mod.rs b/zbus/src/connection/mod.rs
@@ -32,14 +32,17 @@ use crate::{
     fdo::{self, ConnectionCredentials, RequestNameFlags, RequestNameReply},
     message::{self, Flags, Message, Type},
     proxy::CacheProperties,
-    raw::{Connection as RawConnection, Socket},
     DBusError, Error, Executor, Guid, MatchRule, MessageStream, ObjectServer, OwnedMatchRule,
     Result, Task,
 };
 
 mod builder;
 pub use builder::Builder;
 
+mod raw;
+use raw::Connection as RawConnection;
+pub use raw::Socket;
+
 mod socket_reader;
 use socket_reader::SocketReader;
 

diff --git a/zbus/src/raw/connection.rs → zbus/src/connection/raw/connection.rs b/zbus/src/raw/connection.rs → zbus/src/connection/raw/connection.rs
@@ -14,10 +14,11 @@ use crate::{
         header::{MAX_MESSAGE_SIZE, MIN_MESSAGE_SIZE},
         Message, PrimaryHeader,
     },
-    raw::Socket,
     utils::padding_for_8_bytes,
 };
 
+use super::Socket;
+
 use futures_core::ready;
 
 /// A low-level representation of a D-Bus connection

diff --git a/zbus/src/raw/mod.rs → zbus/src/connection/raw/mod.rs b/zbus/src/raw/mod.rs → zbus/src/connection/raw/mod.rs
diff --git a/zbus/src/raw/socket.rs → zbus/src/connection/raw/socket.rs b/zbus/src/raw/socket.rs → zbus/src/connection/raw/socket.rs
diff --git a/zbus/src/connection/socket_reader.rs b/zbus/src/connection/socket_reader.rs
@@ -6,10 +6,9 @@ use std::{
 use futures_util::future::poll_fn;
 use tracing::{debug, instrument, trace};
 
-use crate::{
-    async_lock::Mutex, connection::MsgBroadcaster, raw::Connection as RawConnection, Executor,
-    OwnedMatchRule, Socket, Task,
-};
+use crate::{async_lock::Mutex, connection::MsgBroadcaster, Executor, OwnedMatchRule, Task};
+
+use super::raw::{Connection as RawConnection, Socket};
 
 #[derive(Debug)]
 pub(crate) struct SocketReader {

diff --git a/zbus/src/lib.rs b/zbus/src/lib.rs
@@ -176,8 +176,9 @@ pub use utils::*;
 #[macro_use]
 pub mod fdo;
 
-mod raw;
-pub use raw::Socket;
+#[deprecated(note = "Use `connection::Socket` instead")]
+#[doc(hidden)]
+pub use connection::Socket;
 
 pub mod blocking;