Skip to content

Commit

Permalink
A little bit of simplification for Cargo. (#317)
Browse files Browse the repository at this point in the history
### What

Makes a couple of changes to simplify the Cargo manifests.

1. The resolver is set to `"2"`, which is the modern one and stops it
yelling about it.
2. The versions and editions are set in once place, not many.

### How

Trivially.
  • Loading branch information
SamirTalwar authored Sep 25, 2023
1 parent 09ad089 commit 4ceb74a
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 21 deletions.
8 changes: 5 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[workspace.package]
version = "0.1.0"

[workspace]
resolver = "2"

package.version = "0.1.0"
package.edition = "2021"

members = [
"crates/connectors/ndc-citus",
"crates/connectors/ndc-cockroach",
Expand Down
4 changes: 2 additions & 2 deletions crates/connectors/ndc-citus/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "ndc-citus"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true

default-run = "ndc-citus"

Expand Down
4 changes: 2 additions & 2 deletions crates/connectors/ndc-cockroach/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "ndc-cockroach"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true

default-run = "ndc-cockroach"

Expand Down
4 changes: 2 additions & 2 deletions crates/connectors/ndc-postgres/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "ndc-postgres"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true

default-run = "ndc-postgres"

Expand Down
4 changes: 2 additions & 2 deletions crates/query-engine/execution/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "query-engine-execution"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true

[dependencies]
ndc-sdk = { git = "https://github.com/hasura/ndc-hub.git", rev = "e16b85a", package = "ndc-sdk" }
Expand Down
4 changes: 2 additions & 2 deletions crates/query-engine/metadata/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "query-engine-metadata"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true

[dependencies]
enum-iterator = "1.4.1"
Expand Down
4 changes: 2 additions & 2 deletions crates/query-engine/sql/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "query-engine-sql"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true

[dependencies]
serde_json = "1.0.107"
4 changes: 2 additions & 2 deletions crates/query-engine/translation/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "query-engine-translation"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true

[dependencies]
ndc-sdk = { git = "https://github.com/hasura/ndc-hub.git", rev = "abfc255", package = "ndc-sdk" }
Expand Down
4 changes: 2 additions & 2 deletions crates/tests/other-db-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "other-db-tests"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true

[features]
# We only run the AWS Aurora tests if this feature is enabled.
Expand Down
4 changes: 2 additions & 2 deletions crates/tests/tests-common/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "tests-common"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true

[lib]
name = "tests_common"
Expand Down

0 comments on commit 4ceb74a

Please sign in to comment.