Skip to content

Commit 5ab01b2

Browse files
authored
Merge branch 'master' into bfops/import-typescript-sdk
2 parents 741208c + 63dff57 commit 5ab01b2

File tree

185 files changed

+1365
-1037
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+1365
-1037
lines changed

.github/workflows/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ jobs:
183183
runs-on: ubuntu-latest
184184
timeout-minutes: 20 # on a successful run, runs in 8 minutes
185185
container:
186-
image: rust:1.83.0
186+
image: rust:1.88.0
187187
options: --privileged
188188
# filter for a comment containing 'benchmarks please'
189189
if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}

Cargo.lock

Lines changed: 172 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ members = [
1111
"crates/commitlog",
1212
"crates/core",
1313
"crates/data-structures",
14+
"crates/datastore",
1415
"crates/durability",
1516
"crates/execution",
1617
"crates/expr",
@@ -90,7 +91,7 @@ debug = true
9091
version = "1.2.0"
9192
edition = "2021"
9293
# update rust-toolchain.toml too!
93-
rust-version = "1.84.0"
94+
rust-version = "1.88.0"
9495

9596
[workspace.dependencies]
9697
spacetimedb = { path = "crates/bindings", version = "1.2.0" }
@@ -104,6 +105,7 @@ spacetimedb-codegen = { path = "crates/codegen", version = "1.2.0" }
104105
spacetimedb-commitlog = { path = "crates/commitlog", version = "1.2.0" }
105106
spacetimedb-core = { path = "crates/core", version = "1.2.0" }
106107
spacetimedb-data-structures = { path = "crates/data-structures", version = "1.2.0" }
108+
spacetimedb-datastore = { path = "crates/datastore", version = "1.2.0" }
107109
spacetimedb-durability = { path = "crates/durability", version = "1.2.0" }
108110
spacetimedb-execution = { path = "crates/execution", version = "1.2.0" }
109111
spacetimedb-expr = { path = "crates/expr", version = "1.2.0" }
@@ -283,6 +285,7 @@ unicode-normalization = "0.1.23"
283285
url = "2.3.1"
284286
urlencoding = "2.1.2"
285287
uuid = { version = "1.2.1", features = ["v4"] }
288+
v8 = "137.2"
286289
walkdir = "2.2.5"
287290
wasmbin = "0.6"
288291
webbrowser = "1.0.2"
@@ -324,3 +327,10 @@ features = [
324327
"broadcast",
325328
"ondemand",
326329
]
330+
331+
[workspace.lints.rust]
332+
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] }
333+
334+
[workspace.lints.clippy]
335+
# FIXME: we should work on this lint incrementally
336+
result_large_err = "allow"

crates/auth/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ jsonwebtoken.workspace = true
1616

1717
[dev-dependencies]
1818
serde_json.workspace = true
19+
20+
[lints]
21+
workspace = true

crates/bench/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ bench = false
4040
spacetimedb-client-api = { path = "../client-api" }
4141
spacetimedb-core = { path = "../core", features = ["test"] }
4242
spacetimedb-data-structures.workspace = true
43+
spacetimedb-datastore.workspace = true
4344
spacetimedb-execution = { path = "../execution" }
4445
spacetimedb-lib = { path = "../lib" }
4546
spacetimedb-paths.workspace = true
@@ -89,3 +90,6 @@ tikv-jemalloc-ctl = { workspace = true }
8990
iai-callgrind = { git = "https://github.com/clockworklabs/iai-callgrind.git", branch = "main" }
9091
iai-callgrind-runner = { git = "https://github.com/clockworklabs/iai-callgrind.git", branch = "main" }
9192
iai-callgrind-macros = { git = "https://github.com/clockworklabs/iai-callgrind.git", branch = "main" }
93+
94+
[lints]
95+
workspace = true

0 commit comments

Comments
 (0)