Skip to content

Change signature of devs's value #4030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mulkieran merged 2 commits into from
May 26, 2026
Merged

Change signature of devs's value #4030

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b90bef
Change signature of devs's value
mulkieran May 19, 2026
5ee2c71
Remove unnecessary trait implementations
mulkieran May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 5 additions & 43 deletions src/dbus/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ use zbus::zvariant::{signature::Child, Basic, Signature, Type, Value};

use crate::{
dbus::util::result_option_to_tuple,
engine::{
ActionAvailability, DevUuid, FilesystemUuid, LockedPoolsInfo, PoolUuid, StoppedPoolsInfo,
},
engine::{ActionAvailability, LockedPoolsInfo, PoolUuid, StoppedPoolsInfo},
};

pub type FilesystemSpec<'a> = Vec<(&'a str, (bool, &'a str), (bool, &'a str))>;
Expand Down Expand Up @@ -80,11 +78,8 @@ impl<'a> From<LockedPoolsInfo> for Value<'a> {
.iter()
.map(|d| {
let mut map = HashMap::new();
map.insert(
"devnode".to_string(),
Value::from(d.devnode.display().to_string()),
);
map.insert("uuid".to_string(), Value::from(d.uuid));
map.insert("devnode".to_string(), d.devnode.display().to_string());
map.insert("uuid".to_string(), d.uuid.simple().to_string());
map
})
.collect::<Vec<_>>(),
Expand Down Expand Up @@ -137,11 +132,8 @@ fn stopped_pools_to_value<'b>(
.iter()
.map(|d| {
let mut map = HashMap::new();
map.insert(
"devnode".to_string(),
Value::from(d.devnode.display().to_string()),
);
map.insert("uuid".to_string(), Value::from(d.uuid));
map.insert("devnode".to_string(), d.devnode.display().to_string());
map.insert("uuid".to_string(), d.uuid.simple().to_string());
map
})
.collect::<Vec<_>>(),
Expand Down Expand Up @@ -255,36 +247,6 @@ impl<'a> From<PoolUuid> for Value<'a> {
}
}

impl Basic for FilesystemUuid {
const SIGNATURE_CHAR: char = 's';
const SIGNATURE_STR: &str = "s";
}

impl Type for FilesystemUuid {
const SIGNATURE: &Signature = &Signature::Str;
}

impl<'a> From<FilesystemUuid> for Value<'a> {
fn from(u: FilesystemUuid) -> Value<'a> {
Value::from(u.simple().to_string())
}
}

impl Basic for DevUuid {
const SIGNATURE_CHAR: char = 's';
const SIGNATURE_STR: &str = "s";
}

impl Type for DevUuid {
const SIGNATURE: &Signature = &Signature::Str;
}

impl<'a> From<DevUuid> for Value<'a> {
fn from(u: DevUuid) -> Value<'a> {
Value::from(u.simple().to_string())
}
}

impl Type for ActionAvailability {
const SIGNATURE: &Signature = &Signature::Str;
}
Expand Down
Loading