Merge pull request #549 from epage/workspace

chore: Switch to workspace inheritance
toml-rs · Apr 28, 2023 · 2cd441c · 2cd441c
2 parents b1430ac + 1315a60
commit 2cd441c
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 63 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,6 +2,22 @@
 members = ["crates/*"]
 resolver = "2"
 
+[workspace.package]
+license = "MIT OR Apache-2.0"
+edition = "2021"
+rust-version = "1.64.0"  # MSRV
+include = [
+  "build.rs",
+  "src/**/*",
+  "Cargo.toml",
+  "Cargo.lock",
+  "LICENSE*",
+  "README.md",
+  "benches/**/*",
+  "examples/**/*",
+  "tests/**/*"
+]
+
 [profile.release]
 debug = 1
 

diff --git a/crates/benchmarks/Cargo.toml b/crates/benchmarks/Cargo.toml
@@ -2,8 +2,8 @@
 name = "toml_benchmarks"
 version = "0.0.0"
 publish = false
-edition = "2021"
-rust-version = "1.64.0"  # MSRV
+edition.workspace = true
+rust-version.workspace = true
 
 [package.metadata.release]
 release = false

diff --git a/crates/serde_spanned/Cargo.toml b/crates/serde_spanned/Cargo.toml
@@ -2,24 +2,16 @@
 name = "serde_spanned"
 version = "0.6.1"
 readme = "README.md"
-license = "MIT OR Apache-2.0"
 keywords = ["serde", "span"]
 categories = ["encoding", "parser-implementations", "parsing", "config"]
 description = "Serde-compatible spanned Value"
 repository = "https://github.com/toml-rs/toml"
 homepage = "https://github.com/toml-rs/toml"
 documentation = "https://docs.rs/serde_spanned"
-edition = "2021"
-rust-version = "1.64.0"  # MSRV
-include = [
-  "src/**/*",
-  "Cargo.toml",
-  "LICENSE*",
-  "README.md",
-  "examples/**/*",
-  "benches/**/*",
-  "tests/**/*"
-]
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+include.workspace = true
 
 [package.metadata.release]
 pre-release-replacements = [

diff --git a/crates/serde_toml/Cargo.toml b/crates/serde_toml/Cargo.toml
@@ -2,21 +2,13 @@
 name = "serde_toml"
 version = "0.0.1"
 readme = "README.md"
-license = "MIT OR Apache-2.0"
 keywords = ["encoding", "toml"]
 categories = ["encoding", "parser-implementations", "parsing", "config"]
 description = "See instead `toml`"
 repository = "https://github.com/toml-rs/toml"
 homepage = "https://github.com/toml-rs/toml"
 documentation = "https://docs.rs/toml"
-edition = "2021"
-rust-version = "1.64.0"  # MSRV
-include = [
-  "src/**/*",
-  "Cargo.toml",
-  "LICENSE*",
-  "README.md",
-  "examples/**/*",
-  "benches/**/*",
-  "tests/**/*"
-]
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+include.workspace = true
diff --git a/crates/toml/Cargo.toml b/crates/toml/Cargo.toml
@@ -2,7 +2,6 @@
 name = "toml"
 version = "0.7.3"
 readme = "README.md"
-license = "MIT OR Apache-2.0"
 keywords = ["encoding", "toml"]
 categories = ["encoding", "parser-implementations", "parsing", "config"]
 description = """
@@ -14,17 +13,10 @@ authors = ["Alex Crichton <alex@alexcrichton.com>"]
 repository = "https://github.com/toml-rs/toml"
 homepage = "https://github.com/toml-rs/toml"
 documentation = "https://docs.rs/toml"
-edition = "2021"
-rust-version = "1.64.0"  # MSRV
-include = [
-  "src/**/*",
-  "Cargo.toml",
-  "LICENSE*",
-  "README.md",
-  "examples/**/*",
-  "benches/**/*",
-  "tests/**/*"
-]
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+include.workspace = true
 
 [package.metadata.release]
 pre-release-replacements = [

diff --git a/crates/toml_datetime/Cargo.toml b/crates/toml_datetime/Cargo.toml
@@ -2,25 +2,17 @@
 name = "toml_datetime"
 version = "0.6.1"
 readme = "README.md"
-license = "MIT OR Apache-2.0"
 keywords = ["encoding", "toml"]
 categories = ["encoding", "parser-implementations", "parsing", "config"]
 description = "A TOML-compatible datetime type"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 repository = "https://github.com/toml-rs/toml"
 homepage = "https://github.com/toml-rs/toml"
 documentation = "https://docs.rs/toml_datetime"
-edition = "2021"
-rust-version = "1.64.0"  # MSRV
-include = [
-  "src/**/*",
-  "Cargo.toml",
-  "LICENSE*",
-  "README.md",
-  "examples/**/*",
-  "benches/**/*",
-  "tests/**/*"
-]
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+include.workspace = true
 
 [package.metadata.release]
 pre-release-replacements = [

diff --git a/crates/toml_edit/Cargo.toml b/crates/toml_edit/Cargo.toml
@@ -2,24 +2,16 @@
 name = "toml_edit"
 version = "0.19.8"
 readme = "README.md"
-license = "MIT OR Apache-2.0"
 keywords = ["encoding", "toml"]
 categories = ["encoding", "parser-implementations", "parsing", "config"]
 description = "Yet another format-preserving TOML parser."
 authors = ["Andronik Ordian <write@reusable.software>", "Ed Page <eopage@gmail.com>"]
 repository = "https://github.com/ordian/toml_edit"
 documentation = "https://docs.rs/toml_edit"
-edition = "2021"
-rust-version = "1.64.0"  # MSRV
-include = [
-  "src/**/*",
-  "Cargo.toml",
-  "LICENSE*",
-  "README.md",
-  "examples/**/*",
-  "benches/**/*",
-  "tests/**/*"
-]
+license.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+include.workspace = true
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--cfg", "docsrs"]

diff --git a/crates/toml_edit_fuzz/Cargo.toml b/crates/toml_edit_fuzz/Cargo.toml
@@ -1,7 +1,8 @@
 [package]
 name = "toml_edit_fuzz"
 version = "0.0.0"
-edition = "2021"
+edition.workspace = true
+rust-version.workspace = true
 publish = false
 
 [package.metadata.release]