From 1d27265d02d0222de35d0d3c098b5b841b13de46 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 25 Jan 2022 16:58:22 +0800 Subject: [PATCH] fix comma formatting in pddb lists to not put a trailing comma --- services/shellchat/src/cmds/pddb_cmd.rs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/services/shellchat/src/cmds/pddb_cmd.rs b/services/shellchat/src/cmds/pddb_cmd.rs index 3c013f05c..8a6f5a494 100644 --- a/services/shellchat/src/cmds/pddb_cmd.rs +++ b/services/shellchat/src/cmds/pddb_cmd.rs @@ -85,7 +85,12 @@ impl<'a> ShellCmdApi<'a> for PddbCmd { list.len() }; for i in 0..checked_len { - match write!(ret, "{}, ", list[i]) { + let sep = if i != checked_len - 1 { + ", " + } else { + "" + }; + match write!(ret, "{}{}", list[i], sep) { Ok(_) => (), Err(_) => break, // overflowed return buffer } @@ -107,7 +112,12 @@ impl<'a> ShellCmdApi<'a> for PddbCmd { list.len() }; for i in 0..checked_len { - match write!(ret, "{}, ", list[i]) { + let sep = if i != checked_len - 1 { + ", " + } else { + "" + }; + match write!(ret, "{}{}", list[i], sep) { Ok(_) => (), Err(_) => break, // overflowed return buffer }