diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2023-01-30 13:52:50 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2023-01-30 13:52:50 +0100 |
| commit | 5d52ebc582d42fe51a28e3476b48b97059d2b8d2 (patch) | |
| tree | 0293ec2332816e3995966461037d525eea93b9c8 /android | |
| parent | 89b43426f6da22101aa52dc661a3a9dbcaac1dd8 (diff) | |
| parent | 3b20d715bb8ec28f0a7cec0f4882ddaaa5a1eb2c (diff) | |
| download | mullvadvpn-5d52ebc582d42fe51a28e3476b48b97059d2b8d2.tar.xz mullvadvpn-5d52ebc582d42fe51a28e3476b48b97059d2b8d2.zip | |
Merge branch 'run-clippy-fix'
Diffstat (limited to 'android')
6 files changed, 16 insertions, 16 deletions
diff --git a/android/translations-converter/src/android/plurals.rs b/android/translations-converter/src/android/plurals.rs index 6378eb502c..df783765bd 100644 --- a/android/translations-converter/src/android/plurals.rs +++ b/android/translations-converter/src/android/plurals.rs @@ -104,7 +104,7 @@ impl Display for PluralResources { writeln!(formatter, "<resources>")?; for entry in &self.entries { - write!(formatter, "{}", entry)?; + write!(formatter, "{entry}")?; } writeln!(formatter, "</resources>") @@ -116,7 +116,7 @@ impl Display for PluralResource { writeln!(formatter, r#" <plurals name="{}">"#, self.name)?; for item in &self.items { - writeln!(formatter, " {}", item)?; + writeln!(formatter, " {item}")?; } writeln!(formatter, " </plurals>") @@ -143,6 +143,6 @@ impl Display for PluralQuantity { PluralQuantity::Other => "other", }; - write!(formatter, "{}", quantity) + write!(formatter, "{quantity}") } } diff --git a/android/translations-converter/src/android/strings.rs b/android/translations-converter/src/android/strings.rs index 19fe03e18f..61a27e9793 100644 --- a/android/translations-converter/src/android/strings.rs +++ b/android/translations-converter/src/android/strings.rs @@ -91,7 +91,7 @@ impl Display for StringResources { writeln!(formatter, "<resources>")?; for string in &self.entries { - writeln!(formatter, " {}", string)?; + writeln!(formatter, " {string}")?; } writeln!(formatter, "</resources>") diff --git a/android/translations-converter/src/gettext/mod.rs b/android/translations-converter/src/gettext/mod.rs index 72601abf0e..b21e6075d5 100644 --- a/android/translations-converter/src/gettext/mod.rs +++ b/android/translations-converter/src/gettext/mod.rs @@ -38,12 +38,12 @@ pub fn append_to_template( writeln!(writer, r#"msgid "{}""#, entry.id)?; match entry.value { - MsgValue::Invariant(value) => writeln!(writer, r#"msgstr "{}""#, value)?, + MsgValue::Invariant(value) => writeln!(writer, r#"msgstr "{value}""#)?, MsgValue::Plural { plural_id, values } => { - writeln!(writer, r#"msgid_plural "{}""#, plural_id)?; + writeln!(writer, r#"msgid_plural "{plural_id}""#)?; for (index, value) in values.into_iter().enumerate() { - writeln!(writer, r#"msgstr[{}] "{}""#, index, value)?; + writeln!(writer, r#"msgstr[{index}] "{value}""#)?; } } } diff --git a/android/translations-converter/src/gettext/parser.rs b/android/translations-converter/src/gettext/parser.rs index c93e0092c8..609ba38122 100644 --- a/android/translations-converter/src/gettext/parser.rs +++ b/android/translations-converter/src/gettext/parser.rs @@ -487,7 +487,7 @@ impl Parser { /// by extracting the index (1), and then extracting the message string by skipping the separator /// (`] "`). fn extract_plural_variant(index_and_string: &str) -> Result<(usize, MsgString), Error> { - let recreate_line = || format!("msgstr[{}\"", index_and_string); + let recreate_line = || format!("msgstr[{index_and_string}\""); let parts: Vec<_> = index_and_string.splitn(2, "] \"").collect(); @@ -530,26 +530,26 @@ fn collect_variants( #[derive(Clone, Debug, Display, Error, Eq, PartialEq)] pub enum Error { /// An unexpected line was read while parsing. - #[display(fmt = "Unexpected line parsing gettext messages: {}", _0)] + #[display(fmt = "Unexpected line parsing gettext messages: {_0}")] UnexpectedLine(#[error(not(source))] String), /// Input uses an unrecognized plural forumal. - #[display(fmt = "Input uses an unrecognized formula for the plural form: {}", _0)] + #[display(fmt = "Input uses an unrecognized formula for the plural form: {_0}")] UnrecognizedPluralFormula(#[error(not(source))] String), /// Input ended with an incomplete entry. - #[display(fmt = "Input ended with an incomplete gettext entry with ID: {}", _0)] + #[display(fmt = "Input ended with an incomplete gettext entry with ID: {_0}")] IncompleteEntry(#[error(not(source))] MsgString), /// Plural entry definition is missing a plural variant. - #[display(fmt = "Plural entry is missing a plural variant: {}", _0)] + #[display(fmt = "Plural entry is missing a plural variant: {_0}")] IncompletePluralEntry(#[error(not(source))] MsgString), /// Plural variant is invalid. - #[display(fmt = "Plural variant line is invalid: {}", _0)] + #[display(fmt = "Plural variant line is invalid: {_0}")] InvalidPluralVariant(#[error(not(source))] String), /// Plural variant index was not parsable. - #[display(fmt = "Plural variant line contains an invalid index: {}", _0)] + #[display(fmt = "Plural variant line contains an invalid index: {_0}")] InvalidPluralIndex(#[error(not(source))] String), } diff --git a/android/translations-converter/src/gettext/plural_form.rs b/android/translations-converter/src/gettext/plural_form.rs index e09e9cfd04..abd1ae7d46 100644 --- a/android/translations-converter/src/gettext/plural_form.rs +++ b/android/translations-converter/src/gettext/plural_form.rs @@ -46,5 +46,5 @@ impl FromStr for PluralForm { /// /// The formula could be an invalid formula, or support for it hasn't been added yet. #[derive(Clone, Debug, Display, Error)] -#[display(fmt = "Unsupported plural formula: {}", _0)] +#[display(fmt = "Unsupported plural formula: {_0}")] pub struct UnsupportedPluralFormulaError(#[error(not(source))] String); diff --git a/android/translations-converter/src/main.rs b/android/translations-converter/src/main.rs index f955e99389..6b63410a59 100644 --- a/android/translations-converter/src/main.rs +++ b/android/translations-converter/src/main.rs @@ -130,7 +130,7 @@ fn main() { &template_path, missing_translations .into_iter() - .inspect(|(missing_translation, id)| println!(" {}: {}", id, missing_translation)) + .inspect(|(missing_translation, id)| println!(" {id}: {missing_translation}")) .map(|(id, _)| gettext::MsgEntry { id: gettext::MsgString::from_unescaped(&id), value: gettext::MsgString::empty().into(), |
