Merge pull request eqlabs#1492 from eqlabs/chris/workspace-rust-ver

Enforce rust-version, edition and license at workspace level
Rooter57 · Nov 3, 2023 · 2a4c7dc · 2a4c7dc
2 parents 8b349d9 + c9dce8f
commit 2a4c7dc
Show file tree

Hide file tree

Showing 26 changed files with 94 additions and 73 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -89,7 +89,7 @@ jobs:
       - name: read msrv
         id: msrv
         run: |
-          msrv=$(grep -P "rust-version =" crates/pathfinder/Cargo.toml | awk '{print $3}' | tr -d '"')
+          msrv=$(grep -P "rust-version =" Cargo.toml | awk '{print $3}' | tr -d '"')
           echo Found msrc: $msrv
           echo "MSRV=$msrv" >> "$GITHUB_OUTPUT"
       - uses: dtolnay/rust-toolchain@master

diff --git a/Cargo.toml b/Cargo.toml
@@ -33,6 +33,11 @@ inherits = "release"
 codegen-units = 1
 lto = true
 
+[workspace.package]
+edition = "2021"
+license = "MIT OR Apache-2.0"
+rust-version = "1.72"
+
 [workspace.dependencies]
 anyhow = "1.0.75"
 assert_matches = "1.5.0"

diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml
@@ -1,7 +1,9 @@
 [package]
 name = "pathfinder-common"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]

diff --git a/crates/compiler/Cargo.toml b/crates/compiler/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "pathfinder-compiler"
 version = "0.1.0"
-edition = "2021"
-license = "MIT OR Apache-2.0"
-rust-version = "1.70"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

diff --git a/crates/ethereum/Cargo.toml b/crates/ethereum/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "pathfinder-ethereum"
 version = "0.1.0"
-edition = "2021"
-license = "MIT OR Apache-2.0"
-rust-version = "1.62"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

diff --git a/crates/executor/Cargo.toml b/crates/executor/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
 name = "pathfinder-executor"
 version = "0.1.0"
-edition = "2021"
-license = "MIT OR Apache-2.0"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

diff --git a/crates/gateway-client/Cargo.toml b/crates/gateway-client/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "starknet-gateway-client"
 version = "0.1.0"
-edition = "2021"
-license = "MIT OR Apache-2.0"
-rust-version = "1.62"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

diff --git a/crates/gateway-test-fixtures/Cargo.toml b/crates/gateway-test-fixtures/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "starknet-gateway-test-fixtures"
 version = "0.1.0"
-edition = "2021"
-license = "MIT OR Apache-2.0"
-rust-version = "1.62"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

diff --git a/crates/gateway-types/Cargo.toml b/crates/gateway-types/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "starknet-gateway-types"
 version = "0.1.0"
-edition = "2021"
-license = "MIT OR Apache-2.0"
-rust-version = "1.62"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

diff --git a/crates/load-test/Cargo.lock b/crates/load-test/Cargo.lock
diff --git a/crates/load-test/Cargo.toml b/crates/load-test/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
 name = "load-test"
 version = "0.1.0"
-edition = "2021"
 description = "Load test for pathfinder JSON-RPC endpoints"
+edition = "2021"
 license = "MIT OR Apache-2.0"
+rust-version = "1.72"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

diff --git a/crates/merkle-tree/Cargo.toml b/crates/merkle-tree/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "pathfinder-merkle-tree"
 version = "0.1.0"
-edition = "2021"
-license = "MIT OR Apache-2.0"
-rust-version = "1.62"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

diff --git a/crates/p2p/Cargo.toml b/crates/p2p/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
 name = "p2p"
 version = "0.1.0"
-edition = "2021"
 description = "Pathfinder P2P"
-license = "MIT OR Apache-2.0"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

diff --git a/crates/p2p_bootstrap/Cargo.toml b/crates/p2p_bootstrap/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
 name = "p2p_bootstrap"
 version = "0.1.0"
-edition = "2021"
 description = "Bootstrap node for Pathfinder P2P"
-license = "MIT OR Apache-2.0"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

diff --git a/crates/p2p_proto/Cargo.toml b/crates/p2p_proto/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
 name = "p2p_proto"
 version = "0.1.0"
-edition = "2021"
-license = "MIT"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 build = "build.rs"
 
 [dependencies]

diff --git a/crates/p2p_proto_derive/Cargo.toml b/crates/p2p_proto_derive/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
 name = "p2p_proto_derive"
 version = "0.1.0"
-edition = "2021"
-license = "MIT"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 
 [lib]
 proc-macro = true

diff --git a/crates/pathfinder/Cargo.toml b/crates/pathfinder/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "pathfinder"
 version = "0.9.4"
-edition = "2021"
-license = "MIT OR Apache-2.0"
-rust-version = "1.72"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]

diff --git a/crates/retry/Cargo.toml b/crates/retry/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "pathfinder-retry"
 version = "0.1.0"
-edition = "2021"
-license = "MIT OR Apache-2.0"
-rust-version = "1.62"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

diff --git a/crates/serde/Cargo.toml b/crates/serde/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "pathfinder-serde"
 version = "0.1.0"
-edition = "2021"
-license = "MIT OR Apache-2.0"
-rust-version = "1.62"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]

diff --git a/crates/stark_curve/Cargo.toml b/crates/stark_curve/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
 name = "stark_curve"
 version = "0.1.0"
-edition = "2021"
-license = "MIT OR Apache-2.0"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]

diff --git a/crates/stark_hash/Cargo.toml b/crates/stark_hash/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
 name = "stark_hash"
 version = "0.1.0"
-edition = "2021"
-license = "MIT OR Apache-2.0"
+edition = { workspace = true }
+license = { workspace = true }
+rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]

diff --git a/crates/stark_hash_python/Cargo.lock b/crates/stark_hash_python/Cargo.lock
diff --git a/crates/stark_hash_python/Cargo.toml b/crates/stark_hash_python/Cargo.toml
@@ -2,6 +2,8 @@
 name = "stark_hash_python"
 version = "0.1.0"
 edition = "2021"
+license = "MIT OR Apache-2.0"
+rust-version = "1.72"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]