Skip to content

Commit

Permalink
Merge pull request #6 from giuseppe-g-gelardi/split-crates
Browse files Browse the repository at this point in the history
separate sync and async crates
  • Loading branch information
giuseppe-g-gelardi authored Dec 7, 2024
2 parents 823cb46 + 3d2fe11 commit fced9e1
Show file tree
Hide file tree
Showing 24 changed files with 1,562 additions and 454 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,4 @@ Cargo.lock
cargobase.json
cargobase-async.json

src/main.rs

.env
18 changes: 8 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
[package]
[workspace]
members = [
"cargobase",
"cargobase-async"
]

[workspace.package]
name = "cargobase"
version = "0.1.1"
edition = "2021"

[dependencies]
[workspace.dependencies]
serde = { version = "1.0.215", features = ["derive"] }
serde_json = { version = "1.0.132", features = ["raw_value"] }
serde_derive = "1.0.188"
base64 = "0.22.1"
# tokio = { version = "1", features = ["full"], optional = true}
tokio = { version = "1", features = ["full"] }
uuid = {version ="1.11.0", features = ["v4"] }
thiserror = "2.0.3"
Expand All @@ -18,10 +23,3 @@ tracing = "0.1"
tracing-subscriber = "0.3"
tracing-test = "0.2.5"

# [features]
# default = ["sync", "async"] # for development
# default = ["sync"]
# sync = [] # synchronous features only
# async = ["tokio"] # asynchronous features only
# full = ["sync", "async"] # all features
# still need a feature for logging/tracing
21 changes: 21 additions & 0 deletions cargobase-async/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[package]
name = "cargobase-async"
version = "0.1.1"
edition = "2021"

[dependencies]
serde = { version = "1.0.215", features = ["derive"] }
serde_json = { version = "1.0.132", features = ["raw_value"] }
serde_derive = "1.0.188"
serde-reflection = "0.4.0"
base64 = "0.22.1"
tokio = { version = "1", features = ["full"] }
uuid = {version ="1.11.0", features = ["v4"] }
thiserror = "2.0.3"
tempfile = "3.14.0"
tracing = "0.1"
tracing-subscriber = "0.3"
tracing-test = "0.2.5"

[lib]
path = "src/lib.rs"
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use serde_json::Value;
use serde_reflection::{ContainerFormat, Named, Tracer, TracerConfig};
use tracing;

use super::DatabaseError;
use crate::DatabaseError;

#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
pub struct Column {
Expand Down
Loading

0 comments on commit fced9e1

Please sign in to comment.