Skip to content

Commit dab377a

Browse files
committed
set_name: return String types for filesystem UUIDs
Signed-off-by: mulhern <amulhern@redhat.com>
1 parent c20b9f2 commit dab377a

File tree

11 files changed

+13
-13
lines changed

11 files changed

+13
-13
lines changed

src/dbus/filesystem/filesystem_3_0/methods.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ pub async fn set_name_method(
1515
uuid: PoolUuid,
1616
fs_uuid: FilesystemUuid,
1717
name: &str,
18-
) -> ((bool, FilesystemUuid), u16, String) {
19-
let default_return = (false, FilesystemUuid::nil());
18+
) -> ((bool, String), u16, String) {
19+
let default_return = (false, FilesystemUuid::nil().simple().to_string());
2020

2121
match engine
2222
.get_mut_pool(PoolIdentifier::Uuid(uuid))
@@ -34,7 +34,7 @@ pub async fn set_name_method(
3434
),
3535
Ok(RenameAction::Renamed(_)) => (
3636
// FIXME: send signal
37-
(true, fs_uuid),
37+
(true, fs_uuid.simple().to_string()),
3838
DbusErrorEnum::OK as u16,
3939
OK_STRING.to_string(),
4040
),

src/dbus/filesystem/filesystem_3_0/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ impl FilesystemR0 {
7777
)]
7878
impl FilesystemR0 {
7979
#[zbus(out_args("result", "return_code", "return_string"))]
80-
async fn set_name(&self, name: &str) -> ((bool, FilesystemUuid), u16, String) {
80+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
8181
set_name_method(&self.engine, self.parent_uuid, self.uuid, name).await
8282
}
8383

src/dbus/filesystem/filesystem_3_1/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl FilesystemR1 {
8181
)]
8282
impl FilesystemR1 {
8383
#[zbus(out_args("result", "return_code", "return_string"))]
84-
async fn set_name(&self, name: &str) -> ((bool, FilesystemUuid), u16, String) {
84+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
8585
set_name_method(&self.engine, self.parent_uuid, self.uuid, name).await
8686
}
8787

src/dbus/filesystem/filesystem_3_2/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl FilesystemR2 {
8181
)]
8282
impl FilesystemR2 {
8383
#[zbus(out_args("result", "return_code", "return_string"))]
84-
async fn set_name(&self, name: &str) -> ((bool, FilesystemUuid), u16, String) {
84+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
8585
set_name_method(&self.engine, self.parent_uuid, self.uuid, name).await
8686
}
8787

src/dbus/filesystem/filesystem_3_3/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl FilesystemR3 {
8181
)]
8282
impl FilesystemR3 {
8383
#[zbus(out_args("result", "return_code", "return_string"))]
84-
async fn set_name(&self, name: &str) -> ((bool, FilesystemUuid), u16, String) {
84+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
8585
set_name_method(&self.engine, self.parent_uuid, self.uuid, name).await
8686
}
8787

src/dbus/filesystem/filesystem_3_4/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl FilesystemR4 {
8181
)]
8282
impl FilesystemR4 {
8383
#[zbus(out_args("result", "return_code", "return_string"))]
84-
async fn set_name(&self, name: &str) -> ((bool, FilesystemUuid), u16, String) {
84+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
8585
set_name_method(&self.engine, self.parent_uuid, self.uuid, name).await
8686
}
8787

src/dbus/filesystem/filesystem_3_5/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl FilesystemR5 {
8181
)]
8282
impl FilesystemR5 {
8383
#[zbus(out_args("result", "return_code", "return_string"))]
84-
async fn set_name(&self, name: &str) -> ((bool, FilesystemUuid), u16, String) {
84+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
8585
set_name_method(&self.engine, self.parent_uuid, self.uuid, name).await
8686
}
8787

src/dbus/filesystem/filesystem_3_6/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ impl FilesystemR6 {
8484
)]
8585
impl FilesystemR6 {
8686
#[zbus(out_args("result", "return_code", "return_string"))]
87-
async fn set_name(&self, name: &str) -> ((bool, FilesystemUuid), u16, String) {
87+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
8888
set_name_method(&self.engine, self.parent_uuid, self.uuid, name).await
8989
}
9090

src/dbus/filesystem/filesystem_3_7/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ impl FilesystemR7 {
8686
)]
8787
impl FilesystemR7 {
8888
#[zbus(out_args("result", "return_code", "return_string"))]
89-
async fn set_name(&self, name: &str) -> ((bool, FilesystemUuid), u16, String) {
89+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
9090
set_name_method(&self.engine, self.parent_uuid, self.uuid, name).await
9191
}
9292

src/dbus/filesystem/filesystem_3_8/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ impl FilesystemR8 {
8383
)]
8484
impl FilesystemR8 {
8585
#[zbus(out_args("result", "return_code", "return_string"))]
86-
async fn set_name(&self, name: &str) -> ((bool, FilesystemUuid), u16, String) {
86+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
8787
set_name_method(&self.engine, self.parent_uuid, self.uuid, name).await
8888
}
8989

0 commit comments

Comments
 (0)