summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-05-26 21:02:16 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-05-28 11:54:59 +0000
commitb7b167095dc8643051f2aed9bd81faf4f40773d8 (patch)
treef05faa41e3690eb295954bc2d424024e1eae429f /android
parentc2648c38091b45ea69f6e4affd1df9a8bb0ae80b (diff)
downloadmullvadvpn-b7b167095dc8643051f2aed9bd81faf4f40773d8.tar.xz
mullvadvpn-b7b167095dc8643051f2aed9bd81faf4f40773d8.zip
Implement `Add` for `MsgString`
Allow joining two `MsgString`s, either by moving them or by borrowing them.
Diffstat (limited to 'android')
-rw-r--r--android/translations-converter/src/gettext/msg_string.rs22
1 files changed, 21 insertions, 1 deletions
diff --git a/android/translations-converter/src/gettext/msg_string.rs b/android/translations-converter/src/gettext/msg_string.rs
index 6bbf77e1e9..216bd2fa4e 100644
--- a/android/translations-converter/src/gettext/msg_string.rs
+++ b/android/translations-converter/src/gettext/msg_string.rs
@@ -1,6 +1,6 @@
use std::{
fmt::{self, Display, Formatter},
- ops::{AddAssign, Deref},
+ ops::{Add, AddAssign, Deref},
};
/// A message string in a gettext translation file.
@@ -66,6 +66,26 @@ where
}
}
+impl<M> Add<M> for MsgString
+where
+ M: AsRef<MsgString>,
+{
+ type Output = MsgString;
+
+ fn add(mut self, other: M) -> Self::Output {
+ self += other;
+ self
+ }
+}
+
+impl<'l, 'r> Add<&'r MsgString> for &'l MsgString {
+ type Output = MsgString;
+
+ fn add(self, other: &'r MsgString) -> Self::Output {
+ MsgString(self.0.clone() + &other.0)
+ }
+}
+
#[cfg(test)]
mod tests {
use super::MsgString;