summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorjonathan <jonathan@mullvad.net>2022-06-10 10:22:44 +0200
committerjonathan <jonathan@mullvad.net>2022-06-13 09:32:53 +0200
commit08b60d4ac77d5f58649930ccd0770e490b732864 (patch)
tree06c6940021736480858b8350edb04675d564da4b /android
parent1065db6ec3e2e0485bd39a5730942071f5cdbaf4 (diff)
downloadmullvadvpn-08b60d4ac77d5f58649930ccd0770e490b732864.tar.xz
mullvadvpn-08b60d4ac77d5f58649930ccd0770e490b732864.zip
Perform a clippy --fix
This is a giant commit which performs only a clippy --fix. Auditing can happen in two ways, either by reading every line or by running a `cargo clippy --fix` on the previous commit and make sure that the result is the same.
Diffstat (limited to 'android')
-rw-r--r--android/translations-converter/src/android/string_value.rs8
-rw-r--r--android/translations-converter/src/gettext/msg_string.rs10
-rw-r--r--android/translations-converter/src/main.rs7
3 files changed, 11 insertions, 14 deletions
diff --git a/android/translations-converter/src/android/string_value.rs b/android/translations-converter/src/android/string_value.rs
index bd202f16fb..04ad23653e 100644
--- a/android/translations-converter/src/android/string_value.rs
+++ b/android/translations-converter/src/android/string_value.rs
@@ -19,9 +19,9 @@ impl StringValue {
/// indices.
pub fn from_unescaped(string: &str) -> Self {
let value_with_parameters = htmlize::escape_text(string)
- .replace(r"\", r"\\")
- .replace("\"", "\\\"")
- .replace(r"'", r"\'");
+ .replace('\\', r"\\")
+ .replace('\"', "\\\"")
+ .replace('\'', r"\'");
let value_without_line_breaks = Self::collapse_line_breaks(value_with_parameters);
let value = Self::ensure_parameters_are_indexed(value_without_line_breaks);
@@ -50,7 +50,7 @@ impl StringValue {
static ref PARAMETER_INDEX: Regex = Regex::new(r"^(\d+)\$").unwrap();
}
- let mut parts = original.split("%");
+ let mut parts = original.split('%');
let mut output = parts.next().unwrap().to_owned();
let mut offset = 1;
diff --git a/android/translations-converter/src/gettext/msg_string.rs b/android/translations-converter/src/gettext/msg_string.rs
index 83bcd90c30..242ff4f2d5 100644
--- a/android/translations-converter/src/gettext/msg_string.rs
+++ b/android/translations-converter/src/gettext/msg_string.rs
@@ -21,11 +21,11 @@ impl MsgString {
/// characters. It will not attempt to escape non-ASCII characters and will just keep them as
/// UTF-8 characters.
pub fn from_unescaped(string: &str) -> Self {
- let string = string.replace(r"\", r"\\");
- let string = string.replace("\n", r"\n");
- let string = string.replace("\r", r"\r");
- let string = string.replace("\t", r"\t");
- let string = string.replace(r#"""#, r#"\""#);
+ let string = string.replace('\\', r"\\");
+ let string = string.replace('\n', r"\n");
+ let string = string.replace('\r', r"\r");
+ let string = string.replace('\t', r"\t");
+ let string = string.replace('"', r#"\""#);
MsgString(string)
}
diff --git a/android/translations-converter/src/main.rs b/android/translations-converter/src/main.rs
index 262f06ff24..fdd384200d 100644
--- a/android/translations-converter/src/main.rs
+++ b/android/translations-converter/src/main.rs
@@ -181,10 +181,7 @@ fn main() {
id,
value: gettext::MsgValue::Plural {
plural_id,
- values: vec![
- gettext::MsgString::empty().into(),
- gettext::MsgString::empty().into(),
- ],
+ values: vec![gettext::MsgString::empty(), gettext::MsgString::empty()],
},
}
}),
@@ -199,7 +196,7 @@ fn main() {
/// `values-en-rUS`.
fn android_locale_directory(locale: &str) -> String {
let mut directory = String::from("values-");
- let mut parts = locale.split("-");
+ let mut parts = locale.split('-');
directory.push_str(parts.next().unwrap());