Merge pull request #348 from alerque/msrv

projectfluent · May 6, 2024 · 5d4338e · 5d4338e
2 parents 704e4ae + 84ceaa1
commit 5d4338e
Show file tree

Hide file tree

Showing 11 changed files with 125 additions and 122 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,24 @@ members = [
   "intl-memoizer",
 ]
 
-exclude = ["fluent-cli"]
+exclude = [
+  "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.5"

diff --git a/Makefile.internal.toml b/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" }
+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.

diff --git a/fluent-bundle/Cargo.toml b/fluent-bundle/Cargo.toml
@@ -5,17 +5,15 @@ A localization system designed to unleash the entire expressive power of
 natural language translations.
 """
 version = "0.15.3"
-edition = "2021"
-authors = [
-  "Zibi Braniecki <zibi@unicode.org>",
-  "Staś Małolepszy <stas@mozilla.com>",
-]
-homepage = "http://www.projectfluent.org"
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/projectfluent/fluent-rs"
+edition.workspace = true
+rust-version.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+authors.workspace = true
+categories.workspace = true
+keywords.workspace = true
 readme = "README.md"
-keywords = ["localization", "l10n", "i18n", "intl", "internationalization"]
-categories = ["localization", "internationalization"]
 include = [
   "src/**/*",
   "benches/*.rs",

diff --git a/fluent-cli/Cargo.toml b/fluent-cli/Cargo.toml
@@ -5,17 +5,15 @@ A collection of command line interface programs
 for Fluent Localization System.
 """
 version = "0.0.1"
-edition = "2021"
-authors = [
-    "Zibi Braniecki <zibi@unicode.org>",
-    "Staś Małolepszy <stas@mozilla.com>"
-]
-homepage = "http://www.projectfluent.org"
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/projectfluent/fluent-rs"
+edition.workspace = true
+rust-version.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+authors.workspace = true
+categories.workspace = true
+keywords.workspace = true
 readme = "README.md"
-keywords = ["localization", "l10n", "i18n", "intl", "internationalization"]
-categories = ["localization", "internationalization"]
 
 [[bin]]
 name = "resolver-cli"

diff --git a/fluent-fallback/Cargo.toml b/fluent-fallback/Cargo.toml
@@ -5,17 +5,15 @@ High-level abstraction model for managing localization resources
 and runtime localization lifecycle.
 """
 version = "0.7.1"
-edition = "2021"
-authors = [
-    "Zibi Braniecki <zibi@unicode.org>",
-    "Staś Małolepszy <stas@mozilla.com>"
-]
-homepage = "http://www.projectfluent.org"
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/projectfluent/fluent-rs"
+edition.workspace = true
+rust-version.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+authors.workspace = true
+categories.workspace = true
+keywords.workspace = true
 readme = "README.md"
-keywords = ["localization", "l10n", "i18n", "intl", "internationalization"]
-categories = ["localization", "internationalization"]
 
 [dependencies]
 fluent-bundle.workspace = true

diff --git a/fluent-pseudo/Cargo.toml b/fluent-pseudo/Cargo.toml
@@ -4,24 +4,22 @@ description = """
 Pseudolocalization transformation API for use with Project Fluent API.
 """
 version = "0.3.2"
-edition = "2021"
-authors = [
-    "Zibi Braniecki <zibi@unicode.org>",
-    "Staś Małolepszy <stas@mozilla.com>"
-]
-homepage = "http://www.projectfluent.org"
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/projectfluent/fluent-rs"
+edition.workspace = true
+rust-version = "1.64.0"
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+authors.workspace = true
+categories.workspace = true
+keywords.workspace = true
 readme = "README.md"
-keywords = ["localization", "l10n", "i18n", "intl", "internationalization"]
-categories = ["localization", "internationalization"]
 include = [
-	"src/**/*",
-	"benches/*.rs",
-	"Cargo.toml",
-	"README.md",
-	"LICENSE-APACHE",
-	"LICENSE-MIT"
+  "src/**/*",
+  "benches/*.rs",
+  "Cargo.toml",
+  "README.md",
+  "LICENSE-APACHE",
+  "LICENSE-MIT"
 ]
 
 [dependencies]

diff --git a/fluent-resmgr/Cargo.toml b/fluent-resmgr/Cargo.toml
@@ -4,17 +4,15 @@ description = """
 Resource manager for Fluent localization resources.
 """
 version = "0.0.7"
-authors = [
-    "Zibi Braniecki <zibi@unicode.org>",
-    "Staś Małolepszy <stas@mozilla.com>"
-]
-edition = "2021"
-homepage = "http://www.projectfluent.org"
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/projectfluent/fluent-rs"
+edition.workspace = true
+rust-version.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+authors.workspace = true
+categories.workspace = true
+keywords.workspace = true
 readme = "README.md"
-keywords = ["localization", "l10n", "i18n", "intl", "internationalization"]
-categories = ["localization", "internationalization"]
 
 [dependencies]
 fluent-bundle.workspace = true

diff --git a/fluent-syntax/Cargo.toml b/fluent-syntax/Cargo.toml
@@ -4,24 +4,22 @@ description = """
 Parser/Serializer tools for Fluent Syntax.
 """
 version = "0.11.1"
-edition = "2021"
-authors = [
-    "Zibi Braniecki <zibi@unicode.org>",
-    "Staś Małolepszy <stas@mozilla.com>"
-]
-homepage = "http://www.projectfluent.org"
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/projectfluent/fluent-rs"
+edition.workspace = true
+rust-version = "1.64.0"
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+authors.workspace = true
+categories.workspace = true
+keywords.workspace = true
 readme = "README.md"
-keywords = ["localization", "l10n", "i18n", "intl", "internationalization"]
-categories = ["localization", "internationalization"]
 include = [
-	"src/**/*",
-	"benches/*.rs",
-	"Cargo.toml",
-	"README.md",
-	"LICENSE-APACHE",
-	"LICENSE-MIT"
+  "src/**/*",
+  "benches/*.rs",
+  "Cargo.toml",
+  "README.md",
+  "LICENSE-APACHE",
+  "LICENSE-MIT"
 ]
 
 [dependencies]

diff --git a/fluent-testing/Cargo.toml b/fluent-testing/Cargo.toml
@@ -4,24 +4,22 @@ description = """
 A collection of mock scenarios for testing fluent-rs components.
 """
 version = "0.0.4"
-authors = [
-    "Zibi Braniecki <zibi@braniecki.net>",
-    "Erik Nordin <enordin@mozilla.com>"
-]
-edition = "2021"
-homepage = "https://www.projectfluent.org"
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/projectfluent/fluent-rs"
+edition.workspace = true
+rust-version.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+authors.workspace = true
+categories.workspace = true
+keywords.workspace = true
 readme = "README.md"
-keywords = ["localization", "l10n", "i18n", "intl", "internationalization"]
-categories = ["localization", "internationalization"]
 include = [
-	"src/**/*",
-	"resources/**/*",
-	"Cargo.toml",
-	"README.md",
-	"LICENSE-APACHE",
-	"LICENSE-MIT"
+  "src/**/*",
+  "resources/**/*",
+  "Cargo.toml",
+  "README.md",
+  "LICENSE-APACHE",
+  "LICENSE-MIT"
 ]
 
 [dependencies]

diff --git a/fluent/Cargo.toml b/fluent/Cargo.toml
@@ -5,24 +5,22 @@ A localization system designed to unleash the entire expressive power of
 natural language translations.
 """
 version = "0.16.1"
-edition = "2021"
-authors = [
-    "Zibi Braniecki <zibi@unicode.org>",
-    "Staś Małolepszy <stas@mozilla.com>"
-]
-homepage = "http://www.projectfluent.org"
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/projectfluent/fluent-rs"
+edition.workspace = true
+rust-version.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+authors.workspace = true
+categories.workspace = true
+keywords.workspace = true
 readme = "README.md"
-keywords = ["localization", "l10n", "i18n", "intl", "internationalization"]
-categories = ["localization", "internationalization"]
 include = [
-	"src/**/*",
-	"benches/*.rs",
-	"Cargo.toml",
-	"README.md",
-	"LICENSE-APACHE",
-	"LICENSE-MIT"
+  "src/**/*",
+  "benches/*.rs",
+  "Cargo.toml",
+  "README.md",
+  "LICENSE-APACHE",
+  "LICENSE-MIT"
 ]
 
 [dependencies]

diff --git a/intl-memoizer/Cargo.toml b/intl-memoizer/Cargo.toml
@@ -5,24 +5,22 @@ A memoizer specifically tailored for storing lazy-initialized
 intl formatters.
 """
 version = "0.5.2"
-edition = "2021"
-authors = [
-    "Zibi Braniecki <zibi@unicode.org>",
-    "Manish Goregaokar <manishsmail@gmail.com>"
-]
-homepage = "http://www.projectfluent.org"
-license = "Apache-2.0 OR MIT"
-repository = "https://github.com/projectfluent/fluent-rs"
+edition.workspace = true
+rust-version.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+authors.workspace = true
+categories.workspace = true
+keywords.workspace = true
 readme = "README.md"
-keywords = ["localization", "l10n", "i18n", "intl", "internationalization"]
-categories = ["localization", "internationalization"]
 include = [
-	"src/**/*",
-	"benches/*.rs",
-	"Cargo.toml",
-	"README.md",
-	"LICENSE-APACHE",
-	"LICENSE-MIT"
+  "src/**/*",
+  "benches/*.rs",
+  "Cargo.toml",
+  "README.md",
+  "LICENSE-APACHE",
+  "LICENSE-MIT"
 ]
 
 [dependencies]