summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorLinus Färnstrand <faern@faern.net>2022-06-08 09:45:13 +0200
committerLinus Färnstrand <linus@mullvad.net>2023-05-23 15:17:40 +0200
commit4b7640a5943ff3fd4195ffa8291f1b98c494ea37 (patch)
treeedad358cbb91fe5935271721401b656e979fb01d /android
parentcd64b16c7ef15072e00b755266cc713e4c8a9730 (diff)
downloadmullvadvpn-4b7640a5943ff3fd4195ffa8291f1b98c494ea37.tar.xz
mullvadvpn-4b7640a5943ff3fd4195ffa8291f1b98c494ea37.zip
Make Android translations-converter compat with rust_2018_idioms
Diffstat (limited to 'android')
-rw-r--r--android/translations-converter/src/android/plurals.rs8
-rw-r--r--android/translations-converter/src/android/string_value.rs2
-rw-r--r--android/translations-converter/src/android/strings.rs4
-rw-r--r--android/translations-converter/src/gettext/msg_string.rs2
4 files changed, 8 insertions, 8 deletions
diff --git a/android/translations-converter/src/android/plurals.rs b/android/translations-converter/src/android/plurals.rs
index 7d88a19135..81d8177449 100644
--- a/android/translations-converter/src/android/plurals.rs
+++ b/android/translations-converter/src/android/plurals.rs
@@ -101,7 +101,7 @@ impl PluralResource {
}
impl Display for PluralResources {
- fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
+ fn fmt(&self, formatter: &mut Formatter<'_>) -> fmt::Result {
writeln!(formatter, r#"<?xml version="1.0" encoding="utf-8"?>"#)?;
writeln!(formatter, "<resources>")?;
@@ -114,7 +114,7 @@ impl Display for PluralResources {
}
impl Display for PluralResource {
- fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
+ fn fmt(&self, formatter: &mut Formatter<'_>) -> fmt::Result {
writeln!(formatter, r#" <plurals name="{}">"#, self.name)?;
for item in &self.items {
@@ -126,7 +126,7 @@ impl Display for PluralResource {
}
impl Display for PluralVariant {
- fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
+ fn fmt(&self, formatter: &mut Formatter<'_>) -> fmt::Result {
write!(
formatter,
r#"<item quantity="{}">{}</item>"#,
@@ -136,7 +136,7 @@ impl Display for PluralVariant {
}
impl Display for PluralQuantity {
- fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
+ fn fmt(&self, formatter: &mut Formatter<'_>) -> fmt::Result {
let quantity = match self {
PluralQuantity::Zero => "zero",
PluralQuantity::One => "one",
diff --git a/android/translations-converter/src/android/string_value.rs b/android/translations-converter/src/android/string_value.rs
index 26f43e7d40..c2f8e7a6ce 100644
--- a/android/translations-converter/src/android/string_value.rs
+++ b/android/translations-converter/src/android/string_value.rs
@@ -93,7 +93,7 @@ impl Deref for StringValue {
}
impl Display for StringValue {
- fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
+ fn fmt(&self, formatter: &mut Formatter<'_>) -> fmt::Result {
write!(formatter, "{}", self.0)
}
}
diff --git a/android/translations-converter/src/android/strings.rs b/android/translations-converter/src/android/strings.rs
index 4a75fa63af..6a9156f341 100644
--- a/android/translations-converter/src/android/strings.rs
+++ b/android/translations-converter/src/android/strings.rs
@@ -88,7 +88,7 @@ fn default_translatable() -> bool {
// Unfortunately, direct serialization to XML isn't working correctly.
impl Display for StringResources {
- fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
+ fn fmt(&self, formatter: &mut Formatter<'_>) -> fmt::Result {
writeln!(formatter, r#"<?xml version="1.0" encoding="utf-8"?>"#)?;
writeln!(formatter, "<resources>")?;
@@ -101,7 +101,7 @@ impl Display for StringResources {
}
impl Display for StringResource {
- fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
+ fn fmt(&self, formatter: &mut Formatter<'_>) -> fmt::Result {
if self.translatable {
write!(
formatter,
diff --git a/android/translations-converter/src/gettext/msg_string.rs b/android/translations-converter/src/gettext/msg_string.rs
index 242ff4f2d5..d7925136e0 100644
--- a/android/translations-converter/src/gettext/msg_string.rs
+++ b/android/translations-converter/src/gettext/msg_string.rs
@@ -38,7 +38,7 @@ impl MsgString {
impl Display for MsgString {
/// Write the ID message string with proper escaping.
- fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
+ fn fmt(&self, formatter: &mut Formatter<'_>) -> fmt::Result {
self.0.fmt(formatter)
}
}