Merge branch 'master' into span

Author: alerque

.cargo/config.toml

@@ -0,0 +1,2 @@
+[resolver]
+incompatible-rust-versions = "fallback"

Cargo.toml

@@ -36,14 +36,37 @@ fluent-langneg = "0.13"
 futures = "0.3"
 iai = "0.1"
 intl_pluralrules = "7.0"
+once_cell = "1.21"
 rustc-hash = "2"
 serde = "1.0"
 serde_json = "1.0"
 thiserror = "2.0"
-tokio = "1.0"
+tokio = "1.38"
 unic-langid = "0.9"
 
 fluent-bundle = { version = "0.15.3", path = "fluent-bundle" }
 fluent-fallback = { version = "0.7.1", path = "fluent-fallback" }
 fluent-pseudo = { version = "0.3.2", path = "fluent-pseudo" }
 fluent-syntax = { version = "0.11.1", path = "fluent-syntax" }
+intl-memoizer = { version = "0.5.2", path = "intl-memoizer" }
+
+[workspace.metadata.typos.default]
+locale = "en-us"
+extend-ignore-re = [
+  "(?s)(#|//|/\\*)\\s*typos: ignore start.*?\\n\\s*(#|//|/\\*)\\s*typos: ignore end",
+]
+
+[workspace.metadata.typos.default.extend-words]
+travelled = "travelled"  # sadly part of a public API and fixing would be a breaking change
+nd = "nd" # appears frequently in inline test messages
+
+[workspace.metadata.typos.files]
+ignore-hidden = false
+extend-exclude = [
+  "/.git",
+  "fluent-bundle/benches/**/*.ftl",
+  "fluent-bundle/examples/**/*.ftl",
+  "fluent-syntax/tests/fixtures/**/*.ftl",
+  "fluent-syntax/tests/fixtures/**/*.json",
+  "fluent-testing/resources/**/*.ftl",
+]

fluent-bundle/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Changelog
 
 ## Unreleased
-  - Bump `self_cell` to 1.x
+  - Implement NUMBER builtin
+  - Improve examples
+  - Refactor to remove unnecessary named lifetimes
+  - Cleanup docs
+  - Satiate Clippy
+  - Bump `smallvec` to 1.13
+  - Bump `rand` to 0.9
+  - Bump `self_cell` to 1.2
   - Bump `serde_yaml` to 0.9
 
 ## fluent-bundle 0.15.3 (March 16, 2024)

fluent-bundle/Cargo.toml

@@ -29,16 +29,16 @@ fluent-syntax.workspace = true
 intl_pluralrules.workspace = true
 rustc-hash.workspace = true
 unic-langid.workspace = true
-intl-memoizer = { version = "0.5.2", path = "../intl-memoizer" }
-self_cell = "1.0"
+intl-memoizer.workspace = true
+self_cell = "1.2"
 smallvec = "1.13"
 
 [dev-dependencies]
 criterion.workspace = true
 iai.workspace = true
 serde = { workspace = true, features = ["derive"] }
 unic-langid = { workspace = true, features = ["macros"] }
-rand = "0.8"
+rand = "0.9"
 serde_yaml = "0.9"
 
 [features]

fluent-bundle/examples/custom_type.rs

@@ -8,7 +8,7 @@
 //
 // Lastly, we'll also create a new formatter which will be memoizable.
 //
-// The type and its options are modelled after ECMA402 Intl.DateTimeFormat.
+// The type and its options are modeled after ECMA402 Intl.DateTimeFormat.
 use intl_memoizer::Memoizable;
 use unic_langid::LanguageIdentifier;
 
@@ -21,7 +21,7 @@ use fluent_bundle::{FluentArgs, FluentBundle, FluentResource, FluentValue};
 //  - timeStyle
 //
 // with an enum of allowed values.
-#[derive(Debug, Default, PartialEq, Eq, Clone, Hash)]
+#[derive(Clone, Debug, Default, Eq, Hash, PartialEq)]
 enum DateTimeStyleValue {
     Full,
     Long,
@@ -49,7 +49,7 @@ impl From<&FluentValue<'_>> for DateTimeStyleValue {
     }
 }
 
-#[derive(Debug, PartialEq, Eq, Default, Clone, Hash)]
+#[derive(Clone, Debug, Default, Eq, Hash, PartialEq)]
 struct DateTimeOptions {
     pub date_style: DateTimeStyleValue,
     pub time_style: DateTimeStyleValue,
@@ -84,7 +84,7 @@ impl From<&FluentArgs<'_>> for DateTimeOptions {
 // Our new custom type will store a value as an epoch number,
 // and the options.
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Clone, Debug, PartialEq)]
 struct DateTime {
     epoch: usize,
     options: DateTimeOptions,

fluent-bundle/src/errors.rs

@@ -2,7 +2,7 @@ use crate::resolver::ResolverError;
 use fluent_syntax::parser::ParserError;
 use std::error::Error;
 
-#[derive(Debug, PartialEq, Eq, Clone)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub enum EntryKind {
     Message,
     Term,
@@ -23,7 +23,7 @@ impl std::fmt::Display for EntryKind {
 ///
 /// It contains three main types of errors that may come up
 /// during runtime use of the fluent-bundle crate.
-#[derive(Debug, PartialEq, Eq, Clone)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub enum FluentError {
     /// An error which occurs when
     /// [`FluentBundle::add_resource`](crate::bundle::FluentBundle::add_resource)

fluent-bundle/src/resolver/errors.rs

@@ -4,7 +4,7 @@ use std::error::Error;
 /// Maps an [`InlineExpression`] into the kind of reference, with owned strings
 /// that identify the expression. This makes it so that the [`InlineExpression`] can
 /// be used to generate an error string.
-#[derive(Debug, PartialEq, Eq, Clone)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub enum ReferenceKind {
     Function {
         id: String,
@@ -49,7 +49,7 @@ where
 
 /// Errors generated during the process of resolving a fluent message into a string.
 /// This process takes place in the `write` method of the `WriteValue` trait.
-#[derive(Debug, PartialEq, Eq, Clone)]
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub enum ResolverError {
     Reference(ReferenceKind),
     NoValue(String),

fluent-bundle/src/types/number.rs

@@ -8,7 +8,7 @@ use intl_pluralrules::operands::PluralOperands;
 use crate::args::FluentArgs;
 use crate::types::FluentValue;
 
-#[derive(Debug, Default, Copy, Clone, Hash, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
 pub enum FluentNumberType {
     #[default]
     Cardinal,
@@ -25,7 +25,7 @@ impl From<&str> for FluentNumberType {
     }
 }
 
-#[derive(Debug, Copy, Clone, Default, Hash, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
 pub enum FluentNumberStyle {
     #[default]
     Decimal,
@@ -44,7 +44,7 @@ impl From<&str> for FluentNumberStyle {
     }
 }
 
-#[derive(Debug, Copy, Clone, Default, Hash, PartialEq, Eq)]
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
 pub enum FluentNumberCurrencyDisplayStyle {
     #[default]
     Symbol,
@@ -63,7 +63,7 @@ impl From<&str> for FluentNumberCurrencyDisplayStyle {
     }
 }
 
-#[derive(Debug, Clone, Hash, PartialEq, Eq)]
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
 pub struct FluentNumberOptions {
     pub r#type: FluentNumberType,
     pub style: FluentNumberStyle,
@@ -134,7 +134,7 @@ impl FluentNumberOptions {
     }
 }
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Clone, Debug, PartialEq)]
 pub struct FluentNumber {
     pub value: f64,
     pub options: FluentNumberOptions,

fluent-bundle/tests/builtins.rs

@@ -4,6 +4,7 @@ use fluent_syntax::ast::Pattern;
 #[test]
 fn test_builtin_number() {
     // 1. Create bundle
+    // typos: ignore start
     let ftl_string = String::from(
         r#"
 count = { NUMBER($num, type: "cardinal") ->
@@ -17,6 +18,7 @@ order = { NUMBER($num, type: "ordinal") ->
     [few] {$num}rd
 }
         "#,
+        // typos: ignore end
     );
 
     let mut bundle = FluentBundle::default();

fluent-bundle/tests/custom_types.rs

@@ -47,7 +47,7 @@ fn fluent_custom_type() {
 
 #[test]
 fn fluent_date_time_builtin() {
-    #[derive(Debug, Default, PartialEq, Clone)]
+    #[derive(Clone, Debug, Default, PartialEq)]
     enum DateTimeStyleValue {
         Full,
         Long,
@@ -73,7 +73,7 @@ fn fluent_date_time_builtin() {
         }
     }
 
-    #[derive(Debug, PartialEq, Default, Clone)]
+    #[derive(Clone, Debug, Default, PartialEq)]
     struct DateTimeOptions {
         pub date_style: DateTimeStyleValue,
         pub time_style: DateTimeStyleValue,
@@ -99,7 +99,7 @@ fn fluent_date_time_builtin() {
         }
     }
 
-    #[derive(Debug, PartialEq, Clone)]
+    #[derive(Clone, Debug, PartialEq)]
     struct DateTime {
         epoch: usize,
         options: DateTimeOptions,