Export stuff and make WiFiDevice owning its Device

src/device.rs

@@ -4,7 +4,7 @@ use std::fmt;
 use errors::*;
 use dbus_nm::DBusNetworkManager;
 
-use wifi::{new_wifi_device, WiFiDevice};
+use wifi::WiFiDevice;
 
 #[derive(Clone)]
 pub struct Device {
@@ -42,7 +42,7 @@ impl Device {
 
     pub fn as_wifi_device(&self) -> Option<WiFiDevice> {
         if self.device_type == DeviceType::WiFi {
-            Some(new_wifi_device(&self.dbus_manager, self))
+            Some(WiFiDevice::new(self.dbus_manager.clone(), self.clone()))
         } else {
             None
         }

src/lib.rs

@@ -30,5 +30,6 @@ mod ssid;
 pub use manager::{Connectivity, NetworkManager};
 pub use connection::{Connection, ConnectionSettings, ConnectionState};
 pub use device::{Device, DeviceState, DeviceType};
-pub use wifi::{AccessPoint, AccessPointCredentials, Security};
+pub use wifi::{AccessPoint, AccessPointCredentials, Security, WiFiDevice};
 pub use service::ServiceState;
+pub use ssid::{Ssid, SsidSlice};

src/ssid.rs

@@ -35,10 +35,6 @@ impl Ssid {
     }
 }
 
-pub trait IntoSsid: Sized {
-    fn into_ssid(self) -> Result<Ssid>;
-}
-
 impl Deref for Ssid {
     type Target = SsidSlice;
 

src/wifi.rs

@@ -1,5 +1,6 @@
 use std::rc::Rc;
 use std::net::Ipv4Addr;
+use std::ops::Deref;
 
 use errors::*;
 use dbus_nm::DBusNetworkManager;
@@ -8,12 +9,22 @@ use connection::{connect_to_access_point, create_hotspot, Connection, Connection
 use device::{Device, PathGetter};
 use ssid::{AsSsidSlice, Ssid, SsidSlice};
 
-pub struct WiFiDevice<'a> {
+pub struct WiFiDevice {
     dbus_manager: Rc<DBusNetworkManager>,
-    device: &'a Device,
+    device: Device,
 }
 
-impl<'a> WiFiDevice<'a> {
+impl WiFiDevice {
+    pub(crate) fn new(
+        dbus_manager: Rc<DBusNetworkManager>,
+        device: Device,
+    ) -> WiFiDevice {
+        WiFiDevice {
+            dbus_manager,
+            device,
+        }
+    }
+
     /// Get the list of access points visible to this device.
     ///
     /// # Examples
@@ -85,6 +96,14 @@ impl<'a> WiFiDevice<'a> {
     }
 }
 
+impl Deref for WiFiDevice {
+    type Target = Device;
+
+    fn deref(&self) -> &Self::Target {
+        &self.device
+    }
+}
+
 #[derive(Debug)]
 pub struct AccessPoint {
     pub path: String,
@@ -166,16 +185,6 @@ bitflags! {
     }
 }
 
-pub fn new_wifi_device<'a>(
-    dbus_manager: &Rc<DBusNetworkManager>,
-    device: &'a Device,
-) -> WiFiDevice<'a> {
-    WiFiDevice {
-        dbus_manager: Rc::clone(dbus_manager),
-        device: device,
-    }
-}
-
 fn get_access_point(manager: &DBusNetworkManager, path: &str) -> Result<Option<AccessPoint>> {
     if let Some(ssid) = manager.get_access_point_ssid(path) {
         let strength = manager.get_access_point_strength(path)?;