Merge branch 'projectfluent:main' into main

Author: HTGAzureX1212

.github/workflows/clippy.yaml

@@ -0,0 +1,23 @@
+name: Clippy
+
+on:
+  pull_request:
+    branches: [ main ]
+  push:
+    branches: [ main ]
+
+
+jobs:
+  lints:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Toolchain setup
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          components: rustfmt
+
+      - name: Clippy
+        run: cargo clippy --all-features -- -Dwarnings

.github/workflows/format.yml

@@ -1,21 +1,24 @@
 name: Rustfmt
 
 on:
-  # Triggers the workflow on push request events but only for the master branch
+  # Triggers the workflow on push or pull request events but only for the main branch
   push:
     branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
 
 jobs:
   format:
     runs-on: ubuntu-latest
     steps:
       - name: Toolchain setup
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: nightly
-          override: true
           components: rustfmt
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run rustfmt
         run: cargo fmt --check

.github/workflows/test.yaml

@@ -21,35 +21,34 @@ jobs:
           - ''
           - '--all-features'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Cache cargo registry
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.cargo/registry
           key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
       - name: Cache cargo index
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.cargo/git
           key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
       - name: Cache cargo binaries
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.cargo/bin
           key: ${{ runner.os }}-cargo-bin-${{ hashFiles('**/Cargo.lock') }}
       - name: Toolchain setup
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: nightly
-          override: true
           components: llvm-tools-preview
       - name: Install grcov
         if: matrix.rust-version == 'nightly' && matrix.cargo-args == '--all-features'
         run: if [[ ! -e ~/.cargo/bin/grcov ]]; then cargo install grcov; fi
       - name: Run tests
         run: cargo test --all-features --no-fail-fast
         env:
-          RUSTFLAGS: '-Zinstrument-coverage'
+          RUSTFLAGS: '-Cinstrument-coverage'
       - name: Run grcov
         if: matrix.rust-version == 'nightly' && matrix.cargo-args == '--all-features'
         # Important! Keep in grcov flags in sync with Makefile.internal.toml.
@@ -73,7 +72,7 @@ jobs:
           --excl-br-line  '\#\[derive\(|// cov\(skip\)'
       - name: Coveralls upload
         if: matrix.rust-version == 'nightly' && matrix.cargo-args == '--all-features'
-        uses: coverallsapp/github-action@master
+        uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-lcov: coverage.lcov

Cargo.toml

@@ -1,33 +1,49 @@
 [workspace]
+resolver = "2"
 members = [
-    "fluent-syntax",
-    "fluent-bundle",
-    "fluent-fallback",
-    "fluent-resmgr",
-    "fluent-pseudo",
-    "fluent-testing",
-    "fluent",
-    "intl-memoizer"
+  "fluent-syntax",
+  "fluent-bundle",
+  "fluent-fallback",
+  "fluent-resmgr",
+  "fluent-pseudo",
+  "fluent-testing",
+  "fluent",
+  "intl-memoizer",
 ]
 
 exclude = [
-    "fluent-cli",
+  "fluent-cli",
 ]
 
+[workspace.package]
+homepage = "https://www.projectfluent.org"
+repository = "https://github.com/projectfluent/fluent-rs"
+license = "Apache-2.0 OR MIT"
+authors = [
+  "Caleb Maclennan <caleb@alerque.com>",
+  "Bruce Mitchener <bruce.mitchener@gmail.com",
+  "Zibi Braniecki <zibi@unicode.org>",
+  "Staś Małolepszy <stas@mozilla.com>",
+]
+categories = ["localization", "internationalization"]
+keywords = ["localization", "l10n", "i18n", "intl", "internationalization"]
+edition = "2021"
+rust-version = "1.67.0"
+
 [workspace.dependencies]
-criterion = "0.3"
+criterion = "0.5"
 fluent-langneg = "0.13"
 futures = "0.3"
 iai = "0.1"
-intl_pluralrules = "7.0.1"
-rustc-hash = "1"
+intl_pluralrules = "7.0"
+rustc-hash = "2"
 serde = "1.0"
 serde_json = "1.0"
-thiserror = "1.0"
+thiserror = "2.0"
 tokio = "1.0"
 unic-langid = "0.9"
 
-fluent-bundle = { path = "fluent-bundle" }
-fluent-fallback = { path = "fluent-fallback" }
-fluent-pseudo = { path = "fluent-pseudo" }
-fluent-syntax = { path = "fluent-syntax" }
+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" }

Makefile.internal.toml

@@ -19,7 +19,11 @@ workspace = false
 command = "cargo"
 args = ["test", "--all-features"]
 # toolchain = "nightly"
-env = { RUSTFLAGS = "-Cinstrument-coverage", RUSTDOCFLAGS = "-Cinstrument-coverage", LLVM_PROFILE_FILE = "llvm_profile-%p-%m.profraw" }
+
+[tasks.coverage-run-tests.env]
+RUSTFLAGS = "-Cinstrument-coverage"
+RUSTDOCFLAGS = "-Cinstrument-coverage"
+LLVM_PROFILE_FILE = "llvm_profile-%p-%m.profraw"
 
 # After generating the .profraw, this step creates the html report.
 # Important! Keep in grcov flags in sync with Makefile.internal.toml.
@@ -43,7 +47,9 @@ args = [
   "--excl-line",     "\\#\\[derive\\(|// cov\\(skip\\)",
   "--excl-br-line",  "\\#\\[derive\\(|// cov\\(skip\\)",
 ]
-env = { LLVM_PROFILE_FILE = "llvm_profile-%p-%m.profraw" }
+
+[tasks.coverage-run-grcov.env]
+LLVM_PROFILE_FILE = "llvm_profile-%p-%m.profraw"
 
 # Cleans up all of the .profraw files left over after running -C instrument-coverage
 [tasks.coverage-clean-profraw]

README.md

@@ -1,54 +1,77 @@
-# Fluent [![Build and test](https://github.com/projectfluent/fluent-rs/workflows/Build%20and%20test/badge.svg)](https://github.com/projectfluent/fluent-rs/actions?query=branch%3Amain+workflow%3A%22Build+and+test%22) [![Coverage Status](https://coveralls.io/repos/github/projectfluent/fluent-rs/badge.svg?branch=main)](https://coveralls.io/github/projectfluent/fluent-rs?branch=main)
+# Project Fluent
 
-`fluent-rs` is a collection of Rust crates implementing [Project Fluent](https://projectfluent.org).
+[![Build](https://github.com/projectfluent/fluent-rs/actions/workflows/test.yaml/badge.svg)](https://github.com/projectfluent/fluent-rs/actions/workflows/test.yaml)
+[![Coverage Status](https://coveralls.io/repos/github/projectfluent/fluent-rs/badge.svg?branch=main)](https://coveralls.io/github/projectfluent/fluent-rs?branch=main)
+
+The `fluent-rs` workspace is a collection of Rust crates implementing [Project Fluent][],
+a localization system designed to unleash the entire expressive power of natural language translations.
+
+Project Fluent keeps simple things simple and makes complex things possible.
+The syntax used for describing translations is easy to read and understand.
+At the same time it allows, when necessary, to represent complex concepts from natural languages like gender, plurals, conjugations, and others.
 
 ## Packages
 
-The crates perform the following functions:
+This workspace contains the following crates:
 
-### fluent [![crates.io](https://img.shields.io/crates/v/fluent.svg)](https://crates.io/crates/fluent)
+### fluent
 
-Umbrella crate combining crates that are ready to be used in production.
+[![crates.io](https://img.shields.io/crates/v/fluent.svg)](https://crates.io/crates/fluent)
+[![docs.rs](https://img.shields.io/docsrs/fluent)](https://docs.rs/fluent)
 
-### fluent-syntax [![crates.io](https://img.shields.io/crates/v/fluent_syntax.svg)](https://crates.io/crates/fluent_syntax)
+An umbrella crate exposing the combined features of fluent-rs crates with additional convenience macros.
 
-Low level Fluent Syntax AST and parser API.
+### fluent-bundle
 
-### fluent-bundle [![crates.io](https://img.shields.io/crates/v/fluent_bundle.svg)](https://crates.io/crates/fluent_bundle)
+[![crates.io](https://img.shields.io/crates/v/fluent_bundle.svg)](https://crates.io/crates/fluent_bundle)
+[![docs.rs](https://img.shields.io/docsrs/fluent-bundle)](https://docs.rs/fluent-bundle)
 
-Implementation of the low-level Fluent Localization System providing localization capabilities for any Rust project.
+A low-level implementation of a collection of localization messages for a single locale.
 
-### fluent-fallback [![crates.io](https://img.shields.io/crates/v/fluent_fallback.svg)](https://crates.io/crates/fluent_fallback)
+### fluent-fallback
 
-Implementation of the high-level Fluent Localization System providing localization capabilities for any Rust project.
+[![crates.io](https://img.shields.io/crates/v/fluent_fallback.svg)](https://crates.io/crates/fluent_fallback)
+[![docs.rs](https://img.shields.io/docsrs/fluent-fallback)](https://docs.rs/fluent-fallback)
 
-### fluent-resmgr [![crates.io](https://img.shields.io/crates/v/fluent_resmgr.svg)](https://crates.io/crates/fluent_resmgr)
+A high-level abstraction model for managing locale bundles and runtime localization lifecycle.
 
-Resource Manager for localization resources.
+### fluent-resmgr
 
-### fluent-cli
+[![crates.io](https://img.shields.io/crates/v/fluent_resmgr.svg)](https://crates.io/crates/fluent_resmgr)
+[![docs.rs](https://img.shields.io/docsrs/fluent-resmgr)](https://docs.rs/fluent-resmgr)
+
+A standalone solution for managing resource files and returning locale bundles.
+
+### fluent-syntax
+
+[![crates.io](https://img.shields.io/crates/v/fluent_syntax.svg)](https://crates.io/crates/fluent_syntax)
+[![docs.rs](https://img.shields.io/docsrs/fluent-syntax)](https://docs.rs/fluent-syntax)
 
-Collection of command line tools for Fluent.
+A low-level parser, AST, and serializer API for the Fluent syntax.
 
-## Running the project
+### fluent-pseudo
 
-Each `fluent-*` directory works with the typical `cargo` commands. In addition there are some general `cargo-make` commands that can be run. First install `cargo-make` via `cargo install --force cargo-make`. The commands are documented in [Makefile.toml](Makefile.toml).
+[![crates.io](https://img.shields.io/crates/v/fluent_pseudo.svg)](https://crates.io/crates/fluent_pseudo)
+[![docs.rs](https://img.shields.io/docsrs/fluent-pseudo)](https://docs.rs/fluent-pseudo)
 
-### Tests
+A pseudolocalization and transformation API.
 
-To run all of the tests for the repo run:
+### fluent-testing
 
-```sh
-cargo make test
-```
+[![crates.io](https://img.shields.io/crates/v/fluent_testing.svg)](https://crates.io/crates/fluent_testing)
+[![docs.rs](https://img.shields.io/docsrs/fluent-testing)](https://docs.rs/fluent-testing)
 
-For local code coverage reports run:
+A collection of mock scenarios for testing fluent-rs components.
+
+### intl-memoizer
+
+[![crates.io](https://img.shields.io/crates/v/intl_memoizer.svg)](https://crates.io/crates/intl_memoizer)
+[![docs.rs](https://img.shields.io/docsrs/intl-memoizer)](https://docs.rs/intl-memoizer)
+
+A memoizer specifically tailored for storing lazy-initialized intl formatters.
+
+### fluent-cli
 
-```sh
-# Install the tools first if you haven't done so. The llvm tools must be available
-# on the path for this to work correctly.
-cargo make install-tools
+A collection of developer-oriented command line tools for Fluent.
 
-# Then coverage can be run like so:
-cargo make coverage
-```
+[Project Fluent]: https://projectfluent.org

docs/local-testing-firefox.md

@@ -39,7 +39,7 @@ Now we need to upgrade all the dependencies to `fluent-rs` in the Firefox codeba
 - [Search for all references](https://searchfox.org/mozilla-central/search?q=%5E%28fluent%28-%5Cw%2B%29%3F%7Cintl-memoizer%29+%3D+%22.*%22&path=&case=false&regexp=true)
 - Update all the references to our local packages by using `{ path = "..." }` in the `Cargo.toml` file of the impacted packages.
 
-### Exemple
+### Example
 
 If both `fluent-rs` and `mozilla_unified` directories are on the same root directory, you can update the `fluent-fallback` entry from `fluent-fallback = "0.7.0"` to `fluent-fallback = { path = "../../../../../fluent-rs/fluent-fallback" }` in the `mozilla-unified/intl/l10n/rust/l10nregistry-ffi/Cargo.toml` file.
 

fluent-bundle/CHANGELOG.md

@@ -1,9 +1,23 @@
 # Changelog
 
 ## Unreleased
-
-  - …
-
+  - Bump `self_cell` to 1.x
+  - Bump `serde_yaml` to 0.9
+
+## fluent-bundle 0.15.3 (March 16, 2024)
+  - This is a 'safe harbor' release prior to bringing on non-Mozilla community maintainers
+  - Implement `From<&String>` for `FluentValue`
+  - Add `FluentValue.into_string` to prevent String clone
+  - Fix `FluentValue::try_number` accepting numbers
+  - Allow optional arguments on `FluentValue`
+  - Fix behavior of `FluentArgs::set`
+  - Resolve function instead in `impl ResolveValue`
+  - Add type alias for concurrent `FluentBundle`
+  - Fix `FluentBundle::format_pattern` lifetimes
+  - Workspace: Update to Rust 2021
+  - Workspace: Add various missing documentation and fix typos and links
+  - Workspace: Cleanup meta-data using workspaces, use SPDX licenses, etc.
+  - Workspace: Apply rustfmt and clippy lint fixes
 ## fluent-bundle 0.15.2 (October 25, 2021)
   - Bump `self_cell` to 0.10.