From cb36c4cd53ee493177c94270e8f32458cb1e1efd Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 23 Aug 2024 15:01:28 +0000 Subject: [PATCH] `i18n-embed 0.15` --- Cargo.lock | 54 +++++++++++++++++++++------------------- Cargo.toml | 4 +-- age/CHANGELOG.md | 1 + age/src/i18n.rs | 2 +- supply-chain/config.toml | 28 ++++++++++++--------- 5 files changed, 49 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9ab62a5..8758b64 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -266,6 +266,15 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "basic-toml" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "823388e228f614e9558c6804262db37960ec8821856535f5c3f59913140558f8" +dependencies = [ + "serde", +] + [[package]] name = "bcrypt-pbkdf" version = "0.10.0" @@ -511,7 +520,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.10.0", ] [[package]] @@ -767,11 +776,12 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.3" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" dependencies = [ "cfg-if", + "crossbeam-utils", "hashbrown", "lock_api", "once_cell", @@ -897,7 +907,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59a98bbaacea1c0eb6a0876280051b892eb73594fd90cf3b20e9c817029c57d2" dependencies = [ - "toml 0.5.11", + "toml", ] [[package]] @@ -1232,23 +1242,23 @@ dependencies = [ [[package]] name = "i18n-config" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6691f16c6a35c1bb99a0f01aa39dd2b884d342b646689e9b8e4d51faf2cfdbd9" +checksum = "8e88074831c0be5b89181b05e6748c4915f77769ecc9a4c372f88b169a8509c9" dependencies = [ + "basic-toml", "log", "serde", "serde_derive", "thiserror", - "toml 0.7.6", "unic-langid", ] [[package]] name = "i18n-embed" -version = "0.14.1" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94205d95764f5bb9db9ea98fa77f89653365ca748e27161f5bbea2ffd50e459c" +checksum = "e901c87176ac0b615033c81dbe927c230f74700abfd60ed953a6f547c87bbe6d" dependencies = [ "arc-swap", "fluent", @@ -1268,9 +1278,9 @@ dependencies = [ [[package]] name = "i18n-embed-fl" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8241a781f49e923415e106fcd1f89c3fab92cc9f699a521c56e95dee273903d3" +checksum = "d73fe51b9655599147183495551696628b335f75b2dbfa225196b16d69d7288e" dependencies = [ "dashmap", "find-crate", @@ -1282,7 +1292,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "strsim", + "strsim 0.11.1", "syn 2.0.75", "unic-langid", ] @@ -2508,6 +2518,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "subtle" version = "2.6.1" @@ -2719,18 +2735,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - [[package]] name = "toml_datetime" version = "0.6.3" @@ -2966,7 +2970,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 86cb889..1e24c15 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,8 +54,8 @@ subtle = "2" zeroize = "1" # Localization -i18n-embed = { version = "0.14", features = ["fluent-system"] } -i18n-embed-fl = "0.8" +i18n-embed = { version = "0.15", features = ["fluent-system"] } +i18n-embed-fl = "0.9" lazy_static = "1" rust-embed = "8" diff --git a/age/CHANGELOG.md b/age/CHANGELOG.md index ab7b138..9186e0f 100644 --- a/age/CHANGELOG.md +++ b/age/CHANGELOG.md @@ -16,6 +16,7 @@ to 1.0.0 are beta releases. - Partial French translation! ### Changed +- Migrated to `i18n-embed 0.15`. - `age::Decryptor` is now an opaque struct instead of an enum with `Recipients` and `Passphrase` variants. - `age::Recipient::wrap_file_key` now returns `(Vec, HashSet)`: diff --git a/age/src/i18n.rs b/age/src/i18n.rs index ebe5439..fb1c9f1 100644 --- a/age/src/i18n.rs +++ b/age/src/i18n.rs @@ -16,7 +16,7 @@ lazy_static! { // Ensure that the fallback language is always loaded, even if the library user // doesn't call `localizer().select(languages)`. let fallback: LanguageIdentifier = "en-US".parse().unwrap(); - language_loader.load_languages(&Localizations, &[&fallback]).unwrap(); + language_loader.load_languages(&Localizations, &[fallback]).unwrap(); language_loader }; } diff --git a/supply-chain/config.toml b/supply-chain/config.toml index 4397ebc..86bb2aa 100644 --- a/supply-chain/config.toml +++ b/supply-chain/config.toml @@ -97,6 +97,10 @@ criteria = "safe-to-run" version = "1.6.0" criteria = "safe-to-deploy" +[[exemptions.basic-toml]] +version = "0.1.9" +criteria = "safe-to-deploy" + [[exemptions.bcrypt-pbkdf]] version = "0.10.0" criteria = "safe-to-deploy" @@ -250,7 +254,7 @@ version = "0.1.0" criteria = "safe-to-deploy" [[exemptions.dashmap]] -version = "5.5.3" +version = "6.0.1" criteria = "safe-to-deploy" [[exemptions.der]] @@ -370,15 +374,15 @@ version = "1.1.1" criteria = "safe-to-run" [[exemptions.i18n-config]] -version = "0.4.5" +version = "0.4.7" criteria = "safe-to-deploy" [[exemptions.i18n-embed]] -version = "0.14.1" +version = "0.15.0" criteria = "safe-to-deploy" [[exemptions.i18n-embed-fl]] -version = "0.8.0" +version = "0.9.1" criteria = "safe-to-deploy" [[exemptions.i18n-embed-impl]] @@ -391,7 +395,7 @@ criteria = "safe-to-deploy" [[exemptions.indexmap]] version = "2.4.0" -criteria = "safe-to-deploy" +criteria = "safe-to-run" [[exemptions.inferno]] version = "0.11.17" @@ -675,7 +679,7 @@ criteria = "safe-to-deploy" [[exemptions.serde_spanned]] version = "0.6.3" -criteria = "safe-to-deploy" +criteria = "safe-to-run" [[exemptions.sha1]] version = "0.10.6" @@ -721,6 +725,10 @@ criteria = "safe-to-deploy" version = "0.1.0" criteria = "safe-to-run" +[[exemptions.strsim]] +version = "0.11.1" +criteria = "safe-to-deploy" + [[exemptions.symbolic-common]] version = "12.10.0" criteria = "safe-to-run" @@ -781,13 +789,9 @@ criteria = "safe-to-run" version = "0.5.9" criteria = "safe-to-deploy" -[[exemptions.toml]] -version = "0.7.6" -criteria = "safe-to-deploy" - [[exemptions.toml_edit]] version = "0.19.14" -criteria = "safe-to-deploy" +criteria = "safe-to-run" [[exemptions.trycmd]] version = "0.14.16" @@ -871,7 +875,7 @@ criteria = "safe-to-deploy" [[exemptions.winnow]] version = "0.5.40" -criteria = "safe-to-deploy" +criteria = "safe-to-run" [[exemptions.wsl]] version = "0.1.0"