Skip to content

Commit

Permalink
chore: release 0.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Fyko committed Dec 14, 2023
1 parent 5d7c906 commit 2446877
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 23 deletions.
13 changes: 8 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ homepage = "https://github.com/trufflehq/scyllax#readme"
readme = "README.md"

[workspace.dependencies]
scyllax-macros = { verison = "0.1.0", path = "./scyllax-macros" }
scyllax-macros-core = { verison = "0.1.0", path = "./scyllax-macros-core" }
scyllax-parser = { verison = "0.1.0", path = "./scyllax-parser" }
scyllax-macros = { verison = "0.1.1", path = "./scyllax-macros" }
scyllax-macros-core = { verison = "0.1.1", path = "./scyllax-macros-core" }
scyllax-parser = { verison = "0.1.1", path = "./scyllax-parser" }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt", "json", "tracing-log", "parking_lot"] }
tokio = { version = "1", features = ["full", "tracing"] }
Expand Down
4 changes: 2 additions & 2 deletions scyllax-cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "scyllax-cli"
description = "The CLI for scyllax -- mainly managing migrations"
version = "0.1.0"
version = "0.1.1"
license.workspace = true
edition.workspace = true
authors.workspace = true
Expand All @@ -23,7 +23,7 @@ url = { version = "2.5.0", default-features = false }
async-trait = "0.1"
console = "0.15.7"
scylla.workspace = true
scyllax = { version = "0.1.0", path = "../scyllax" }
scyllax = { version = "0.1.1", path = "../scyllax" }
serde_json = "1.0.108"
serde = { version = "1.0.193", features = ["derive"] }
tracing-subscriber.workspace = true
Expand Down
4 changes: 2 additions & 2 deletions scyllax-macros-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "scyllax-macros-core"
description = "Core macro impl for scyllax"
version = "0.1.0"
version = "0.1.1"
license.workspace = true
edition.workspace = true
authors.workspace = true
Expand All @@ -15,5 +15,5 @@ convert_case = "0.6.0"
darling = { version = "0.20", features = ["suggestions"] }
proc-macro2 = "1"
quote = "1"
scyllax-parser = { path = "../scyllax-parser", version = "0.1.0" }
scyllax-parser = { path = "../scyllax-parser", version = "0.1.1" }
syn = { version = "2", features = ["full", "derive", "extra-traits"] }
4 changes: 2 additions & 2 deletions scyllax-macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "scyllax-macros"
description = "Macros for scyllax"
version = "0.1.0"
version = "0.1.1"
license.workspace = true
edition.workspace = true
authors.workspace = true
Expand All @@ -13,4 +13,4 @@ readme = "../README.md"
proc-macro = true

[dependencies]
scyllax-macros-core = { path = "../scyllax-macros-core", version = "0.1.0" }
scyllax-macros-core = { path = "../scyllax-macros-core", version = "0.1.1" }
2 changes: 1 addition & 1 deletion scyllax-parser/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "scyllax-parser"
description = "A parser for CQL queries"
version = "0.1.0"
version = "0.1.1"
license.workspace = true
edition.workspace = true
repository.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions scyllax/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "scyllax"
readme = "../README.md"
description = "A SQLx and Discord inspired query system for Scylla"
version = "0.1.0"
version = "0.1.1"
license.workspace = true
edition.workspace = true
authors.workspace = true
Expand All @@ -15,8 +15,8 @@ getrandom = "0.2"
mac_address = "1"
once_cell = "1"
scylla.workspace = true
scyllax-macros = { version = "0.1.0", path = "../scyllax-macros" }
scyllax-macros-core = { version = "0.1.0", path = "../scyllax-macros-core" }
scyllax-macros = { version = "0.1.1", path = "../scyllax-macros" }
scyllax-macros-core = { version = "0.1.1", path = "../scyllax-macros-core" }
thiserror = "1"
tokio.workspace = true
tracing.workspace = true
Expand Down
14 changes: 9 additions & 5 deletions scyllax/src/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ impl From<Json> for prost_types::Struct {
kind: Some(match json {
Value::Null => Kind::NullValue(0 /* wot? */),
Value::Bool(v) => Kind::BoolValue(v),
Value::Number(n) => Kind::NumberValue(n.as_f64().expect("Non-f64-representable number")),
Value::Number(n) => {
Kind::NumberValue(n.as_f64().expect("Non-f64-representable number"))
}
Value::String(s) => Kind::StringValue(s),
Value::Array(v) => Kind::ListValue(prost_types::ListValue {
values: v.into_iter().map(serde_json_to_prost).collect(),
Expand Down Expand Up @@ -84,11 +86,13 @@ impl From<prost_types::Struct> for Json {
match value.kind.unwrap() {
Kind::NullValue(_) => Value::Null,
Kind::BoolValue(v) => Value::Bool(v),
Kind::NumberValue(n) => {
Value::Number(serde_json::Number::from_f64(n).expect("Non-f64-representable number"))
}
Kind::NumberValue(n) => Value::Number(
serde_json::Number::from_f64(n).expect("Non-f64-representable number"),
),
Kind::StringValue(s) => Value::String(s),
Kind::ListValue(v) => Value::Array(v.values.into_iter().map(prost_to_serde_json).collect()),
Kind::ListValue(v) => {
Value::Array(v.values.into_iter().map(prost_to_serde_json).collect())
}
Kind::StructValue(v) => Value::Object(from_struct(v)),
}
}
Expand Down

0 comments on commit 2446877

Please sign in to comment.