Upgrade to Rust 1.85 and edition 2024

crates/i18n/src/sprintf/formatter.rs

@@ -8,7 +8,7 @@ use std::fmt::Formatter;
 
 use pad::{Alignment, PadStr};
 use serde::Serialize;
-use serde_json::{ser::PrettyFormatter, Value};
+use serde_json::{Value, ser::PrettyFormatter};
 use thiserror::Error;
 
 use super::{ArgumentList, Message};

crates/i18n/src/sprintf/parser.rs

@@ -8,7 +8,7 @@
 
 use std::str::FromStr;
 
-use pest::{error::ErrorVariant, iterators::Pair, Parser, Span};
+use pest::{Parser, Span, error::ErrorVariant, iterators::Pair};
 
 use super::message::{
     ArgumentReference, Message, PaddingSpecifier, Part, Placeholder, TypeSpecifier,
@@ -119,7 +119,7 @@ fn interpret_padding_specifier(pair: &Pair<Rule>) -> Result<PaddingSpecifier> {
                     message: format!("Unexpected padding specifier: {specifier:?}"),
                 },
                 pair.as_span(),
-            ))
+            ));
         }
     };
 
@@ -177,7 +177,7 @@ fn interpret_type_specifier(pair: &Pair<Rule>) -> Result<TypeSpecifier> {
                     message: String::from("Unexpected type specifier"),
                 },
                 pair.as_span(),
-            ))
+            ));
         }
     };
 

crates/i18n/src/translations.rs

@@ -11,9 +11,9 @@ use std::{
 
 use icu_plurals::PluralCategory;
 use serde::{
+    Deserialize, Deserializer, Serialize, Serializer,
     de::{MapAccess, Visitor},
     ser::SerializeMap,
-    Deserialize, Deserializer, Serialize, Serializer,
 };
 
 use crate::sprintf::Message;
@@ -300,7 +300,7 @@ impl Value {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::sprintf::{arg_list, ArgumentList};
+    use crate::sprintf::{ArgumentList, arg_list};
 
     #[test]
     fn test_it_works() {

crates/i18n/src/translator.rs

@@ -14,11 +14,11 @@ use icu_locid_transform::fallback::{
 };
 use icu_plurals::{PluralRules, PluralsError};
 use icu_provider::{
-    data_key, fallback::LocaleFallbackConfig, DataError, DataErrorKind, DataKey, DataLocale,
-    DataRequest, DataRequestMetadata,
+    DataError, DataErrorKind, DataKey, DataLocale, DataRequest, DataRequestMetadata, data_key,
+    fallback::LocaleFallbackConfig,
 };
 use icu_provider_adapters::fallback::LocaleFallbackProvider;
-use icu_relativetime::{options::Numeric, RelativeTimeFormatter, RelativeTimeFormatterOptions};
+use icu_relativetime::{RelativeTimeFormatter, RelativeTimeFormatterOptions, options::Numeric};
 use thiserror::Error;
 use writeable::Writeable;