From 4c604a075876b2f7a1499e6e7922c2e9942dbdb9 Mon Sep 17 00:00:00 2001 From: Lucy Date: Fri, 21 Jan 2022 11:12:35 -0500 Subject: [PATCH] Derive `Debug` on everything --- networkmanager/src/access_point.rs | 1 + networkmanager/src/active_connection.rs | 1 + networkmanager/src/config/ip4.rs | 1 + networkmanager/src/config/ip6.rs | 1 + networkmanager/src/device.rs | 1 + networkmanager/src/device/bluetooth.rs | 1 + networkmanager/src/device/wired.rs | 1 + networkmanager/src/device/wireless.rs | 1 + networkmanager/src/nm.rs | 1 + networkmanager/src/settings.rs | 1 + networkmanager/src/settings/connection.rs | 3 ++- 11 files changed, 12 insertions(+), 1 deletion(-) diff --git a/networkmanager/src/access_point.rs b/networkmanager/src/access_point.rs index 62e6925..99a5f07 100644 --- a/networkmanager/src/access_point.rs +++ b/networkmanager/src/access_point.rs @@ -7,6 +7,7 @@ use crate::interface::{ use std::ops::Deref; use zbus::Result; +#[derive(Debug)] pub struct AccessPoint<'a>(AccessPointProxy<'a>); impl<'a> AccessPoint<'a> { diff --git a/networkmanager/src/active_connection.rs b/networkmanager/src/active_connection.rs index 377aed9..74b2d2b 100644 --- a/networkmanager/src/active_connection.rs +++ b/networkmanager/src/active_connection.rs @@ -13,6 +13,7 @@ use crate::{ use std::ops::Deref; use zbus::Result; +#[derive(Debug)] pub struct ActiveConnection<'a>(ActiveConnectionProxy<'a>); impl<'a> ActiveConnection<'a> { diff --git a/networkmanager/src/config/ip4.rs b/networkmanager/src/config/ip4.rs index adfb258..2e3d2d8 100644 --- a/networkmanager/src/config/ip4.rs +++ b/networkmanager/src/config/ip4.rs @@ -3,6 +3,7 @@ use crate::interface::config::ip4::Ipv4ConfigProxy; use std::{net::Ipv4Addr, ops::Deref}; use zbus::Result; +#[derive(Debug)] pub struct Ipv4Config<'a>(Ipv4ConfigProxy<'a>); impl<'a> Ipv4Config<'a> { diff --git a/networkmanager/src/config/ip6.rs b/networkmanager/src/config/ip6.rs index 10204da..2a3662f 100644 --- a/networkmanager/src/config/ip6.rs +++ b/networkmanager/src/config/ip6.rs @@ -3,6 +3,7 @@ use crate::interface::config::ip6::Ipv6ConfigProxy; use std::{net::Ipv6Addr, ops::Deref}; use zbus::Result; +#[derive(Debug)] pub struct Ipv6Config<'a>(Ipv6ConfigProxy<'a>); impl<'a> Ipv6Config<'a> { diff --git a/networkmanager/src/device.rs b/networkmanager/src/device.rs index e8a58f8..ff4c6db 100644 --- a/networkmanager/src/device.rs +++ b/networkmanager/src/device.rs @@ -20,6 +20,7 @@ use crate::{ use std::{net::Ipv4Addr, ops::Deref}; use zbus::Result; +#[derive(Debug)] pub struct Device<'a>(DeviceProxy<'a>); impl<'a> Device<'a> { diff --git a/networkmanager/src/device/bluetooth.rs b/networkmanager/src/device/bluetooth.rs index 9fde723..2607313 100644 --- a/networkmanager/src/device/bluetooth.rs +++ b/networkmanager/src/device/bluetooth.rs @@ -5,6 +5,7 @@ use crate::interface::device::{bluetooth::BluetoothDeviceProxy, DeviceProxy}; use std::ops::Deref; use zbus::Result; +#[derive(Debug)] pub struct BluetoothDevice<'a>(BluetoothDeviceProxy<'a>); impl<'a> BluetoothDevice<'a> { diff --git a/networkmanager/src/device/wired.rs b/networkmanager/src/device/wired.rs index bc0087b..33427bf 100644 --- a/networkmanager/src/device/wired.rs +++ b/networkmanager/src/device/wired.rs @@ -5,6 +5,7 @@ use crate::interface::device::{wired::WiredDeviceProxy, DeviceProxy}; use std::ops::Deref; use zbus::Result; +#[derive(Debug)] pub struct WiredDevice<'a>(WiredDeviceProxy<'a>); impl<'a> WiredDevice<'a> { diff --git a/networkmanager/src/device/wireless.rs b/networkmanager/src/device/wireless.rs index d1ef8dd..a904e41 100644 --- a/networkmanager/src/device/wireless.rs +++ b/networkmanager/src/device/wireless.rs @@ -12,6 +12,7 @@ use crate::{ use std::ops::Deref; use zbus::Result; +#[derive(Debug)] pub struct WirelessDevice<'a>(WirelessDeviceProxy<'a>); impl<'a> WirelessDevice<'a> { diff --git a/networkmanager/src/nm.rs b/networkmanager/src/nm.rs index 72a0e12..d303790 100644 --- a/networkmanager/src/nm.rs +++ b/networkmanager/src/nm.rs @@ -13,6 +13,7 @@ use crate::{ }; use zbus::{zvariant::ObjectPath, Result}; +#[derive(Debug)] pub struct NetworkManager<'a>(NetworkManagerProxy<'a>); impl<'a> NetworkManager<'a> { diff --git a/networkmanager/src/settings.rs b/networkmanager/src/settings.rs index 6c1123d..3dccf29 100644 --- a/networkmanager/src/settings.rs +++ b/networkmanager/src/settings.rs @@ -6,6 +6,7 @@ use self::connection::Connection; use crate::interface::settings::{connection::ConnectionSettingsProxy, SettingsProxy}; use zbus::Result; +#[derive(Debug)] pub struct NetworkManagerSettings<'a>(SettingsProxy<'a>); impl<'a> NetworkManagerSettings<'a> { diff --git a/networkmanager/src/settings/connection.rs b/networkmanager/src/settings/connection.rs index c76b304..d7f0be6 100644 --- a/networkmanager/src/settings/connection.rs +++ b/networkmanager/src/settings/connection.rs @@ -4,6 +4,7 @@ use crate::interface::settings::connection::ConnectionSettingsProxy; use derive_builder::Builder; use std::ops::Deref; +#[derive(Debug)] pub struct Connection<'a>(ConnectionSettingsProxy<'a>); impl<'a> Deref for Connection<'a> { @@ -22,7 +23,7 @@ impl<'a> From> for Connection<'a> { macro_rules! derive_value_build { ($name:ident, $(($arg:ident($rename:expr): $arg_ty:ty)),*) => { - #[derive(Builder, Clone, zbus::zvariant::DeserializeDict, zbus::zvariant::SerializeDict, zbus::zvariant::Type)] + #[derive(Debug, Builder, Clone, zbus::zvariant::DeserializeDict, zbus::zvariant::SerializeDict, zbus::zvariant::Type)] pub struct $name { $( #[zvariant(rename = $rename)]