1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-22 22:38:08 +00:00

feat(core/rust): some useful traits for TString

string equality comparison and SkipPrefix
This commit is contained in:
matejcik 2024-03-16 20:42:54 +01:00 committed by matejcik
parent f3b884bf93
commit 9c287adf64
4 changed files with 41 additions and 7 deletions

View File

@ -93,13 +93,20 @@ pub enum TString<'a> {
#[cfg(feature = "micropython")]
Allocated(StrBuffer),
#[cfg(feature = "translations")]
Translation(TR),
Translation {
tr: TR,
offset: u16,
},
Str(&'a str),
}
impl TString<'_> {
pub fn len(&self) -> usize {
self.map(|s| s.len())
}
pub fn is_empty(&self) -> bool {
self.map(|s| s.is_empty())
self.len() == 0
}
/// Maps the string to a value using a closure.
@ -118,7 +125,7 @@ impl TString<'_> {
#[cfg(feature = "micropython")]
Self::Allocated(buf) => fun(buf.as_ref()),
#[cfg(feature = "translations")]
Self::Translation(tr) => tr.map_translated(fun),
Self::Translation { tr, offset } => tr.map_translated(|s| fun(&s[*offset as usize..])),
Self::Str(s) => fun(s),
}
}
@ -127,7 +134,7 @@ impl TString<'_> {
impl TString<'static> {
#[cfg(feature = "translations")]
pub const fn from_translation(tr: TR) -> Self {
Self::Translation(tr)
Self::Translation { tr, offset: 0 }
}
#[cfg(feature = "micropython")]
@ -183,3 +190,30 @@ impl<'a> TryFrom<TString<'a>> for Obj {
s.map(|t| t.try_into())
}
}
impl<'a, 'b> PartialEq<TString<'a>> for TString<'b> {
fn eq(&self, other: &TString<'a>) -> bool {
self.map(|s| other.map(|o| s == o))
}
}
impl Eq for TString<'_> {}
impl SkipPrefix for TString<'_> {
fn skip_prefix(&self, skip_bytes: usize) -> Self {
self.map(|s| {
assert!(skip_bytes <= s.len());
assert!(s.is_char_boundary(skip_bytes));
});
match self {
#[cfg(feature = "micropython")]
Self::Allocated(s) => Self::Allocated(s.skip_prefix(skip_bytes)),
#[cfg(feature = "translations")]
Self::Translation { tr, offset } => Self::Translation {
tr: *tr,
offset: offset + skip_bytes as u16,
},
Self::Str(s) => Self::Str(&s[skip_bytes..]),
}
}
}

View File

@ -6,7 +6,7 @@
#[cfg(feature = "micropython")]
use crate::micropython::qstr::Qstr;
#[derive(Debug, Copy, Clone, FromPrimitive)]
#[derive(Debug, Copy, Clone, FromPrimitive, PartialEq, Eq)]
#[repr(u16)]
#[allow(non_camel_case_types)]
pub enum TranslatedString {

View File

@ -35,7 +35,7 @@ en_data = json.loads(en_file.read_text())["translations"]
#[cfg(feature = "micropython")]
use crate::micropython::qstr::Qstr;
#[derive(Debug, Copy, Clone, FromPrimitive)]
#[derive(Debug, Copy, Clone, FromPrimitive, PartialEq, Eq)]
#[repr(u16)]
#[allow(non_camel_case_types)]
pub enum TranslatedString {

View File

@ -32,7 +32,7 @@ impl TranslatedString {
}
pub const fn as_tstring(self) -> TString<'static> {
TString::Translation(self)
TString::from_translation(self)
}
}