From ff81b1a6ed0bbc02d2e89520bcddde5cb979e4b4 Mon Sep 17 00:00:00 2001 From: xphoniex Date: Mon, 26 Jun 2023 17:04:33 +0000 Subject: [PATCH] node: Use `str::trim_end_matches` for stripping '\0' in alias Signed-off-by: xphoniex --- radicle-node/src/service/message.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/radicle-node/src/service/message.rs b/radicle-node/src/service/message.rs index 950b7346..872b2698 100644 --- a/radicle-node/src/service/message.rs +++ b/radicle-node/src/service/message.rs @@ -121,12 +121,7 @@ impl NodeAnnouncement { /// Get the alias as a UTF-8 string. pub fn alias(&self) -> Result<&str, std::str::Utf8Error> { - let length = self - .alias - .iter() - .position(|&b| b == 0) - .unwrap_or(self.alias.len()); - str::from_utf8(&self.alias[..length]) + Ok(str::from_utf8(&self.alias)?.trim_end_matches(0 as char)) } }