mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
regex search/replace instances of xous_ipc::String to String
codegenerator fixes
This commit is contained in:
parent
f2fbc7fafd
commit
849ae5f874
2 changed files with 5 additions and 6 deletions
|
|
@ -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();
|
writeln!(menu, " menu_items.push(MenuItem {{",).unwrap();
|
||||||
assert_eq!(manifest.menu_name.len(), 1, "Improper menu name record entry");
|
assert_eq!(manifest.menu_name.len(), 1, "Improper menu name record entry");
|
||||||
for name in manifest.menu_name.keys() {
|
for name in manifest.menu_name.keys() {
|
||||||
writeln!(menu, " name: xous_ipc::String::from_str(t!(\"{}\", locales::LANG)),", name)
|
writeln!(menu, " name: String::from(t!(\"{}\", locales::LANG)),", name).unwrap();
|
||||||
.unwrap();
|
|
||||||
}
|
}
|
||||||
writeln!(menu, " action_conn: Some(status_conn),",).unwrap();
|
writeln!(menu, " action_conn: Some(status_conn),",).unwrap();
|
||||||
writeln!(menu, " action_opcode: StatusOpcode::SwitchToApp.to_u32().unwrap(),",).unwrap();
|
writeln!(menu, " action_opcode: StatusOpcode::SwitchToApp.to_u32().unwrap(),",).unwrap();
|
||||||
|
|
|
||||||
|
|
@ -73,11 +73,11 @@ fn print_header<U: Write>(out: &mut U) {
|
||||||
|
|
||||||
pub(crate) fn get_version() -> crate::api::VersionString {
|
pub(crate) fn get_version() -> crate::api::VersionString {
|
||||||
let mut v = crate::api::VersionString {
|
let mut v = crate::api::VersionString {
|
||||||
version: xous_ipc::String::new()
|
version: String::new()
|
||||||
};
|
};
|
||||||
v.version.append(SEMVER).ok();
|
v.version.push_str(SEMVER);
|
||||||
v.version.append("\n").ok();
|
v.version.push_str("\n");
|
||||||
v.version.append(TIMESTAMP).ok();
|
v.version.push_str(TIMESTAMP);
|
||||||
v
|
v
|
||||||
}
|
}
|
||||||
"####;
|
"####;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue