From 849ae5f8749da5683992fc5eb53b60bafb6c7dd8 Mon Sep 17 00:00:00 2001
From: bunnie <bunnie@kosagi.com>
Date: Sun, 22 Sep 2024 14:19:46 +0800
Subject: [PATCH] regex search/replace instances of xous_ipc::String to String

codegenerator fixes
---
 xtask/src/app_manifest.rs | 3 +--
 xtask/src/versioning.rs   | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/xtask/src/app_manifest.rs b/xtask/src/app_manifest.rs
index ac20976f1..136ce7934 100644
--- a/xtask/src/app_manifest.rs
+++ b/xtask/src/app_manifest.rs
@@ -172,8 +172,7 @@ pub(crate) fn app_menu_items(menu_items: &mut Vec::<MenuItem>, status_conn: u32)
         writeln!(menu, "    menu_items.push(MenuItem {{",).unwrap();
         assert_eq!(manifest.menu_name.len(), 1, "Improper menu name record entry");
         for name in manifest.menu_name.keys() {
-            writeln!(menu, "        name: xous_ipc::String::from_str(t!(\"{}\", locales::LANG)),", name)
-                .unwrap();
+            writeln!(menu, "        name: String::from(t!(\"{}\", locales::LANG)),", name).unwrap();
         }
         writeln!(menu, "        action_conn: Some(status_conn),",).unwrap();
         writeln!(menu, "        action_opcode: StatusOpcode::SwitchToApp.to_u32().unwrap(),",).unwrap();
diff --git a/xtask/src/versioning.rs b/xtask/src/versioning.rs
index beb531c8c..ed0831d98 100644
--- a/xtask/src/versioning.rs
+++ b/xtask/src/versioning.rs
@@ -73,11 +73,11 @@ fn print_header<U: Write>(out: &mut U) {
 
 pub(crate) fn get_version() -> crate::api::VersionString {
     let mut v = crate::api::VersionString {
-        version: xous_ipc::String::new()
+        version: String::new()
     };
-    v.version.append(SEMVER).ok();
-    v.version.append("\n").ok();
-    v.version.append(TIMESTAMP).ok();
+    v.version.push_str(SEMVER);
+    v.version.push_str("\n");
+    v.version.push_str(TIMESTAMP);
     v
 }
 "####;