Skip to content

Commit 71a9eca

Browse files
committed
set_name: return String types for pool UUIDs
Signed-off-by: mulhern <[email protected]>
1 parent 26ab67f commit 71a9eca

File tree

11 files changed

+13
-13
lines changed

11 files changed

+13
-13
lines changed

src/dbus/pool/pool_3_0/methods.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -537,8 +537,8 @@ pub async fn set_name_method(
537537
manager: &Lockable<Arc<RwLock<Manager>>>,
538538
pool_uuid: PoolUuid,
539539
name: &str,
540-
) -> ((bool, PoolUuid), u16, String) {
541-
let default_return = (false, PoolUuid::default());
540+
) -> ((bool, String), u16, String) {
541+
let default_return = (false, PoolUuid::default().simple().to_string());
542542

543543
match engine.rename_pool(pool_uuid, name).await {
544544
Ok(RenameAction::NoSource) => {
@@ -563,7 +563,7 @@ pub async fn set_name_method(
563563
}
564564
};
565565
(
566-
(true, pool_uuid),
566+
(true, pool_uuid.simple().to_string()),
567567
DbusErrorEnum::OK as u16,
568568
OK_STRING.to_string(),
569569
)

src/dbus/pool/pool_3_0/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ impl PoolR0 {
180180
.await
181181
}
182182

183-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
183+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
184184
set_name_method(
185185
&self.engine,
186186
&self.connection,

src/dbus/pool/pool_3_1/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ impl PoolR1 {
183183
.await
184184
}
185185

186-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
186+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
187187
set_name_method(
188188
&self.engine,
189189
&self.connection,

src/dbus/pool/pool_3_2/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ impl PoolR2 {
180180
.await
181181
}
182182

183-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
183+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
184184
set_name_method(
185185
&self.engine,
186186
&self.connection,

src/dbus/pool/pool_3_3/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ impl PoolR3 {
184184
.await
185185
}
186186

187-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
187+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
188188
set_name_method(
189189
&self.engine,
190190
&self.connection,

src/dbus/pool/pool_3_4/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ impl PoolR4 {
181181
.await
182182
}
183183

184-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
184+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
185185
set_name_method(
186186
&self.engine,
187187
&self.connection,

src/dbus/pool/pool_3_5/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ impl PoolR5 {
185185
.await
186186
}
187187

188-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
188+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
189189
set_name_method(
190190
&self.engine,
191191
&self.connection,

src/dbus/pool/pool_3_6/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ impl PoolR6 {
187187
.await
188188
}
189189

190-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
190+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
191191
set_name_method(
192192
&self.engine,
193193
&self.connection,

src/dbus/pool/pool_3_7/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ impl PoolR7 {
188188
.await
189189
}
190190

191-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
191+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
192192
set_name_method(
193193
&self.engine,
194194
&self.connection,

src/dbus/pool/pool_3_8/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ impl PoolR8 {
200200
.await
201201
}
202202

203-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
203+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
204204
set_name_method(
205205
&self.engine,
206206
&self.connection,

0 commit comments

Comments
 (0)