i18n-embed-fl 0.3

Fixes an issue where `cargo update` breaks builds (due to how
i18n-embed-fl 0.2 was not pinning its pre-release dashmap dependency).
This commit is contained in:
Jack Grigg 2021-01-11 21:55:25 +00:00
parent 48f5382c80
commit 31320c9f97
5 changed files with 234 additions and 101 deletions

94
Cargo.lock generated
View file

@ -1,5 +1,15 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
name = "Inflector"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
dependencies = [
"lazy_static",
"regex",
]
[[package]]
name = "adler32"
version = "1.2.0"
@ -604,11 +614,12 @@ dependencies = [
[[package]]
name = "dashmap"
version = "4.0.0-rc6"
version = "4.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "308a6703be2d759cb5fb7b80a23547fe73a8d5ebf70d3a4ca7f0ef4c0bfc2265"
checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c"
dependencies = [
"once_cell",
"cfg-if 1.0.0",
"num_cpus",
]
[[package]]
@ -690,9 +701,9 @@ dependencies = [
[[package]]
name = "fluent"
version = "0.13.1"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef9e54ec7b674ae3477d948ae790e90ae24d54fb31c2e7173252978d9b09bdfa"
checksum = "960ac6317b829b94c67f9a774e8b56db388405e174855a5a84d4b461ff85b281"
dependencies = [
"fluent-bundle",
"unic-langid",
@ -700,15 +711,16 @@ dependencies = [
[[package]]
name = "fluent-bundle"
version = "0.13.2"
version = "0.14.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "092ebd50cd3f8a6d664bf156e3550d2f7232fbe446da6707d727cca53f707ce2"
checksum = "ba3cc2d1c59a0daaa93bb346db97e1ebad1067c5ffedc1af8b937a9d8caa6a77"
dependencies = [
"fluent-langneg",
"fluent-syntax",
"intl-memoizer",
"intl_pluralrules",
"rental",
"ouroboros",
"rustc-hash",
"smallvec",
"unic-langid",
]
@ -724,9 +736,9 @@ dependencies = [
[[package]]
name = "fluent-syntax"
version = "0.10.0"
version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9389354f858e38f37d9a249133611a1fcaec469f44773b04ddbd82f4f08d49eb"
checksum = "784f660373ea898f712a7e67b43f35bf79608d46112747c29767d087611d716b"
[[package]]
name = "fuse"
@ -988,9 +1000,9 @@ dependencies = [
[[package]]
name = "i18n-embed"
version = "0.9.3"
version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97a93abd62abc94f103dc1927e5cb13aa98474596392ce481a0ea3799a703e4d"
checksum = "820f9b2730acafbe8aa8998781f31136d9d3611daf81dc95490a61831756e0ac"
dependencies = [
"fluent",
"fluent-langneg",
@ -1008,9 +1020,9 @@ dependencies = [
[[package]]
name = "i18n-embed-fl"
version = "0.2.0"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c485929b9a7dd3d77cc3db75d8f50f7c108c77e76c0569ac45e78840762c4131"
checksum = "b8be988544c631312b138c18ee00f5a36db42cbd12017db67b53f807c078fd0b"
dependencies = [
"dashmap",
"find-crate",
@ -1071,9 +1083,9 @@ dependencies = [
[[package]]
name = "intl_pluralrules"
version = "7.0.0"
version = "7.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c271cdb1f12a9feb3a017619c3ee681f971f270f6757341d6abe1f9f7a98bc3"
checksum = "b18f988384267d7066cc2be425e6faf352900652c046b6971d2e228d3b1c5ecf"
dependencies = [
"tinystr",
"unic-langid",
@ -1365,6 +1377,29 @@ version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afb2e1c3ee07430c2cf76151675e583e0f19985fa6efae47d6848a3e2c824f85"
[[package]]
name = "ouroboros"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "069fb33e127cabdc8ad6a287eed9719b85c612d36199777f6dc41ad91f7be41a"
dependencies = [
"ouroboros_macro",
"stable_deref_trait",
]
[[package]]
name = "ouroboros_macro"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ad938cc920f299d6dce91e43d3ce316e785f4aa4bc4243555634dc2967098fc6"
dependencies = [
"Inflector",
"proc-macro-error",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "parking_lot"
version = "0.11.1"
@ -1694,27 +1729,6 @@ version = "0.6.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189"
[[package]]
name = "rental"
version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8545debe98b2b139fb04cad8618b530e9b07c152d99a5de83c860b877d67847f"
dependencies = [
"rental-impl",
"stable_deref_trait",
]
[[package]]
name = "rental-impl"
version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "ring"
version = "0.16.16"
@ -1800,6 +1814,12 @@ dependencies = [
"walkdir",
]
[[package]]
name = "rustc-hash"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustc_version"
version = "0.2.3"

View file

@ -70,8 +70,8 @@ futures = { version = "0.3", optional = true }
pin-project = "1"
# Localization
i18n-embed = { version = "0.9", features = ["fluent-system"] }
i18n-embed-fl = "0.2"
i18n-embed = { version = "0.10", features = ["fluent-system"] }
i18n-embed-fl = "0.3"
lazy_static = "1"
rust-embed = "5"

112
fuzz-afl/Cargo.lock generated
View file

@ -1,5 +1,15 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
name = "Inflector"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
dependencies = [
"lazy_static",
"regex",
]
[[package]]
name = "aead"
version = "0.3.2"
@ -72,6 +82,15 @@ dependencies = [
"age",
]
[[package]]
name = "aho-corasick"
version = "0.7.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
dependencies = [
"memchr",
]
[[package]]
name = "ansi_term"
version = "0.11.0"
@ -241,11 +260,12 @@ dependencies = [
[[package]]
name = "dashmap"
version = "4.0.0-rc6"
version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "308a6703be2d759cb5fb7b80a23547fe73a8d5ebf70d3a4ca7f0ef4c0bfc2265"
checksum = "4b937cd1fbd1f194ac842196bd2529f21618088ee6d8bff6a46ece611451c96b"
dependencies = [
"once_cell",
"cfg-if 1.0.0",
"num_cpus",
]
[[package]]
@ -268,9 +288,9 @@ dependencies = [
[[package]]
name = "fluent"
version = "0.13.1"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef9e54ec7b674ae3477d948ae790e90ae24d54fb31c2e7173252978d9b09bdfa"
checksum = "bdb1332a30e4eb0d388961ccd7f3fcbc907d37072caac5aa3fcdb09b372223b2"
dependencies = [
"fluent-bundle",
"unic-langid",
@ -278,15 +298,15 @@ dependencies = [
[[package]]
name = "fluent-bundle"
version = "0.13.2"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "092ebd50cd3f8a6d664bf156e3550d2f7232fbe446da6707d727cca53f707ce2"
checksum = "25eb8ef496c9db4cc473cbfb9dd1ccbfa65117940fe2f998a5e4b37355fa82ce"
dependencies = [
"fluent-langneg",
"fluent-syntax",
"intl-memoizer",
"intl_pluralrules",
"rental",
"ouroboros",
"smallvec",
"unic-langid",
]
@ -302,9 +322,9 @@ dependencies = [
[[package]]
name = "fluent-syntax"
version = "0.10.0"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9389354f858e38f37d9a249133611a1fcaec469f44773b04ddbd82f4f08d49eb"
checksum = "edb1016e8c600060e0099218442fff329a204f6316d6ec974d590d3281517a52"
[[package]]
name = "fxhash"
@ -381,9 +401,9 @@ dependencies = [
[[package]]
name = "i18n-embed"
version = "0.9.3"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97a93abd62abc94f103dc1927e5cb13aa98474596392ce481a0ea3799a703e4d"
checksum = "d1677788294a1cd0f0b9ffe078b433a800e65c5ad5fe2573ba38e154dd8d24ed"
dependencies = [
"fluent",
"fluent-langneg",
@ -400,9 +420,9 @@ dependencies = [
[[package]]
name = "i18n-embed-fl"
version = "0.2.0"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c485929b9a7dd3d77cc3db75d8f50f7c108c77e76c0569ac45e78840762c4131"
checksum = "b8be988544c631312b138c18ee00f5a36db42cbd12017db67b53f807c078fd0b"
dependencies = [
"dashmap",
"find-crate",
@ -522,10 +542,14 @@ dependencies = [
]
[[package]]
name = "once_cell"
version = "1.5.2"
name = "num_cpus"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
dependencies = [
"hermit-abi",
"libc",
]
[[package]]
name = "opaque-debug"
@ -533,6 +557,28 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "ouroboros"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc04551635026d3ac7bc646698ea1836a85ed2a26b7094fe1d15d8b14854c4a2"
dependencies = [
"ouroboros_macro",
"stable_deref_trait",
]
[[package]]
name = "ouroboros_macro"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cec33dfceabec83cd0e95a5ce9d20e76ab3a5cbfef59659b8c927f69b93ed8ae"
dependencies = [
"Inflector",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "parking_lot"
version = "0.11.1"
@ -693,25 +739,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
[[package]]
name = "rental"
version = "0.5.5"
name = "regex"
version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8545debe98b2b139fb04cad8618b530e9b07c152d99a5de83c860b877d67847f"
checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
dependencies = [
"rental-impl",
"stable_deref_trait",
"aho-corasick",
"memchr",
"regex-syntax",
"thread_local",
]
[[package]]
name = "rental-impl"
version = "0.5.5"
name = "regex-syntax"
version = "0.6.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
[[package]]
name = "rust-embed"
@ -941,6 +984,15 @@ dependencies = [
"syn",
]
[[package]]
name = "thread_local"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447"
dependencies = [
"lazy_static",
]
[[package]]
name = "tinystr"
version = "0.3.4"

121
fuzz/Cargo.lock generated
View file

@ -1,5 +1,15 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
name = "Inflector"
version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
dependencies = [
"lazy_static",
"regex",
]
[[package]]
name = "aead"
version = "0.3.2"
@ -61,6 +71,15 @@ dependencies = [
"libfuzzer-sys",
]
[[package]]
name = "aho-corasick"
version = "0.7.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
dependencies = [
"memchr",
]
[[package]]
name = "arbitrary"
version = "0.2.0"
@ -201,11 +220,12 @@ dependencies = [
[[package]]
name = "dashmap"
version = "4.0.0-rc6"
version = "4.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "308a6703be2d759cb5fb7b80a23547fe73a8d5ebf70d3a4ca7f0ef4c0bfc2265"
checksum = "4b937cd1fbd1f194ac842196bd2529f21618088ee6d8bff6a46ece611451c96b"
dependencies = [
"once_cell",
"cfg-if 1.0.0",
"num_cpus",
]
[[package]]
@ -228,9 +248,9 @@ dependencies = [
[[package]]
name = "fluent"
version = "0.13.1"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef9e54ec7b674ae3477d948ae790e90ae24d54fb31c2e7173252978d9b09bdfa"
checksum = "bdb1332a30e4eb0d388961ccd7f3fcbc907d37072caac5aa3fcdb09b372223b2"
dependencies = [
"fluent-bundle",
"unic-langid",
@ -238,15 +258,15 @@ dependencies = [
[[package]]
name = "fluent-bundle"
version = "0.13.2"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "092ebd50cd3f8a6d664bf156e3550d2f7232fbe446da6707d727cca53f707ce2"
checksum = "25eb8ef496c9db4cc473cbfb9dd1ccbfa65117940fe2f998a5e4b37355fa82ce"
dependencies = [
"fluent-langneg",
"fluent-syntax",
"intl-memoizer",
"intl_pluralrules",
"rental",
"ouroboros",
"smallvec",
"unic-langid",
]
@ -262,9 +282,9 @@ dependencies = [
[[package]]
name = "fluent-syntax"
version = "0.10.0"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9389354f858e38f37d9a249133611a1fcaec469f44773b04ddbd82f4f08d49eb"
checksum = "edb1016e8c600060e0099218442fff329a204f6316d6ec974d590d3281517a52"
[[package]]
name = "fxhash"
@ -296,6 +316,15 @@ dependencies = [
"wasi",
]
[[package]]
name = "hermit-abi"
version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
dependencies = [
"libc",
]
[[package]]
name = "hkdf"
version = "0.10.0"
@ -332,9 +361,9 @@ dependencies = [
[[package]]
name = "i18n-embed"
version = "0.9.3"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97a93abd62abc94f103dc1927e5cb13aa98474596392ce481a0ea3799a703e4d"
checksum = "d1677788294a1cd0f0b9ffe078b433a800e65c5ad5fe2573ba38e154dd8d24ed"
dependencies = [
"fluent",
"fluent-langneg",
@ -351,9 +380,9 @@ dependencies = [
[[package]]
name = "i18n-embed-fl"
version = "0.2.0"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c485929b9a7dd3d77cc3db75d8f50f7c108c77e76c0569ac45e78840762c4131"
checksum = "b8be988544c631312b138c18ee00f5a36db42cbd12017db67b53f807c078fd0b"
dependencies = [
"dashmap",
"find-crate",
@ -482,10 +511,14 @@ dependencies = [
]
[[package]]
name = "once_cell"
version = "1.5.2"
name = "num_cpus"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
dependencies = [
"hermit-abi",
"libc",
]
[[package]]
name = "opaque-debug"
@ -493,6 +526,28 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "ouroboros"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc04551635026d3ac7bc646698ea1836a85ed2a26b7094fe1d15d8b14854c4a2"
dependencies = [
"ouroboros_macro",
"stable_deref_trait",
]
[[package]]
name = "ouroboros_macro"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cec33dfceabec83cd0e95a5ce9d20e76ab3a5cbfef59659b8c927f69b93ed8ae"
dependencies = [
"Inflector",
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "parking_lot"
version = "0.11.1"
@ -653,25 +708,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
[[package]]
name = "rental"
version = "0.5.5"
name = "regex"
version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8545debe98b2b139fb04cad8618b530e9b07c152d99a5de83c860b877d67847f"
checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
dependencies = [
"rental-impl",
"stable_deref_trait",
"aho-corasick",
"memchr",
"regex-syntax",
"thread_local",
]
[[package]]
name = "rental-impl"
version = "0.5.5"
name = "regex-syntax"
version = "0.6.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "475e68978dc5b743f2f40d8e0a8fdc83f1c5e78cbf4b8fa5e74e73beebc340de"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
[[package]]
name = "rust-embed"
@ -862,6 +914,15 @@ dependencies = [
"syn",
]
[[package]]
name = "thread_local"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447"
dependencies = [
"lazy_static",
]
[[package]]
name = "tinystr"
version = "0.3.4"

View file

@ -48,8 +48,8 @@ chrono = "0.4"
console = "0.13"
env_logger = "0.8"
gumdrop = "0.8"
i18n-embed = { version = "0.9", features = ["desktop-requester", "fluent-system"] }
i18n-embed-fl = "0.2"
i18n-embed = { version = "0.10", features = ["desktop-requester", "fluent-system"] }
i18n-embed-fl = "0.3"
lazy_static = "1"
log = "0.4"
minreq = { version = "2", features = ["https"] }