Skip to content

Commit

Permalink
Use rust workspace Inheritance.
Browse files Browse the repository at this point in the history
  • Loading branch information
gudaoxuri committed Feb 2, 2023
1 parent 68a0603 commit 6984c86
Show file tree
Hide file tree
Showing 13 changed files with 56 additions and 42 deletions.
13 changes: 13 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,15 @@
[workspace]
members = ["tardis-macros", "tardis", "examples/*"]

[workspace.package]
version = "0.1.0-alpha34"
authors = ["gudaoxuri <i@sunisle.org>"]
description = "Elegant, clean Rust development framework"
keywords = ["http", "database", "web", "redis", "mq"]
categories = ["asynchronous", "web-programming", "database", "caching"]
homepage = "https://github.com/ideal-world/tardis"
documentation = "https://docs.rs/tardis/"
repository = "https://github.com/ideal-world/tardis"
edition = "2021"
license = "MIT/Apache-2.0"
rust-version = "1.64"
4 changes: 2 additions & 2 deletions examples/cache/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "tardis-example-cache"
version = "0.1.0"
authors = ["gudaoxuri"]
edition = "2021"
authors.workspace = true
edition.workspace = true
publish = false

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions examples/mq/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "tardis-example-mq"
version = "0.1.0"
authors = ["gudaoxuri"]
edition = "2021"
authors.workspace = true
edition.workspace = true
publish = false

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions examples/multi-apps/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "tardis-example-multi-apps"
version = "0.1.0"
authors = ["gudaoxuri"]
edition = "2021"
authors.workspace = true
edition.workspace = true
publish = false

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions examples/perf-test/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "tardis-example-perf-test"
version = "0.1.0"
authors = ["gudaoxuri"]
edition = "2021"
authors.workspace = true
edition.workspace = true
publish = false

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions examples/pg-graph-search/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "tardis-example-pg-graph_search"
version = "0.1.0"
authors = ["gudaoxuri"]
edition = "2021"
authors.workspace = true
edition.workspace = true
publish = false

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions examples/reldb/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "tardis-example-reldb"
version = "0.1.0"
authors = ["gudaoxuri"]
edition = "2021"
authors.workspace = true
edition.workspace = true
publish = false

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions examples/todos/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "tardis-example-todos"
version = "0.1.0"
authors = ["gudaoxuri"]
edition = "2021"
authors.workspace = true
edition.workspace = true
publish = false

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions examples/web-basic/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "tardis-example-web-basic"
version = "0.1.0"
authors = ["gudaoxuri"]
edition = "2021"
authors.workspace = true
edition.workspace = true
publish = false

[dependencies]
Expand Down
4 changes: 2 additions & 2 deletions examples/web-client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "tardis-example-web-client"
version = "0.1.0"
authors = ["gudaoxuri"]
edition = "2021"
authors.workspace = true
edition.workspace = true
publish = false

[dependencies]
Expand Down
5 changes: 3 additions & 2 deletions examples/websocket/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
[package]
name = "tardis-example-websocket"
version = "0.1.0"
authors = ["gudaoxuri"]
edition = "2021"
authors.workspace = true
edition.workspace = true
publish = false

[dependencies]
serde = { version = "1", features = ["derive"] }
tardis = { path = "../../tardis", features = ["web-server"] }
20 changes: 10 additions & 10 deletions tardis-macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[package]
name = "tardis-macros"
version = "0.1.0-alpha33"
authors = ["gudaoxuri <i@sunisle.org>"]
description = "Elegant, clean Rust development framework"
keywords = ["http", "database", "web", "redis", "mq"]
categories = ["asynchronous", "web-programming", "database", "caching"]
homepage = "https://github.com/ideal-world/tardis"
documentation = "https://docs.rs/tardis/"
repository = "https://github.com/ideal-world/tardis"
license = "MIT"
edition = "2021"
version.workspace = true
authors.workspace = true
description.workspace = true
keywords.workspace = true
categories.workspace = true
homepage.workspace = true
documentation.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true

[lib]
name = "tardis_macros"
Expand Down
24 changes: 12 additions & 12 deletions tardis/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[package]
name = "tardis"
version = "0.1.0-alpha33"
authors = ["gudaoxuri <i@sunisle.org>"]
description = "Elegant, clean Rust development framework"
keywords = ["http", "database", "web", "redis", "mq"]
categories = ["asynchronous", "web-programming", "database", "caching"]
homepage = "https://github.com/ideal-world/tardis"
documentation = "https://docs.rs/tardis/"
repository = "https://github.com/ideal-world/tardis"
license = "MIT"
edition = "2021"
version.workspace = true
authors.workspace = true
description.workspace = true
keywords.workspace = true
categories.workspace = true
homepage.workspace = true
documentation.workspace = true
repository.workspace = true
license.workspace = true
edition.workspace = true
readme = "README.md"

[profile.release]
Expand Down Expand Up @@ -67,7 +67,7 @@ tracing = { version = "0.1" }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

# macros
tardis-macros = { version = "0.1.0-alpha33", path = "../tardis-macros", optional = true }
tardis-macros = { version = "0.1.0-alpha34", path = "../tardis-macros", optional = true }

# Tokio
tokio = { version = "1.18", features = [
Expand Down Expand Up @@ -101,7 +101,7 @@ sqlparser = { version = "0.30", optional = true }
# Web Server
poem-openapi = { version = "2", features = [
"rapidoc",
"chrono",
"websocket",
], optional = true }
poem-openapi-derive = { version = "2", optional = true }
poem = { version = "1.3", features = [
Expand Down

0 comments on commit 6984c86

Please sign in to comment.