Skip to content

Fix environment #5961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
coolreader18 wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

Fix environment #5961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e7284b2
Add rust-toolchain-sync.sh
coolreader18 Sep 9, 2026
ead6317
Bump rust toolchain to 1.96.1
coolreader18 Sep 9, 2026
c3ebbf8
Fix clippy lints
coolreader18 Sep 9, 2026
b302c14
Run cargo fmt
coolreader18 Sep 17, 2026
8bcd971
Fix test_detect_getrandom - now fails with a linker error
coolreader18 Sep 18, 2026
2e0ba86
Bless ui tests
coolreader18 Sep 18, 2026
afaa8ff
WIP make the environment API not horrible
coolreader18 Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/benchmarks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ jobs:
runs-on: spacetimedb-linux
timeout-minutes: 20 # on a successful run, runs in 8 minutes
container:
image: rust:1.93.0
# !rust-toolchain-sync
image: rust:1.96.1
options: --privileged
# disable until we fix the benchmarks
if: false
Expand Down
26 changes: 26 additions & 0 deletions Cargo.lock
View file
Open in desktop

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

5 changes: 3 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ debug = true
version = "2.10.1"
edition = "2024"
# update rust-toolchain.toml too!
rust-version = "1.93.0"
rust-version = "1.96.0"

[workspace.dependencies]
spacetimedb = { path = "crates/bindings", version = "=2.10.1" }
Expand Down Expand Up @@ -193,7 +193,7 @@ arrayvec = "0.7.2"
async-channel = "2.5"
async-stream = "0.3.6"
async-trait = "0.1.68"
axum = { version = "0.7", features = ["tracing", "http2"] }
axum = { version = "0.7", features = ["tracing", "http2", "macros"] }
axum-extra = { version = "0.9", features = ["typed-header"] }
base64 = "0.21.2"
bigdecimal = "0.4.7"
Expand Down Expand Up @@ -305,6 +305,7 @@ serde_json = { version = "1.0.128", features = ["raw_value"] }
serde_path_to_error = "0.1.9"
serde_with = { version = "3.3.0", features = ["base64", "hex"] }
serial_test = "2.0.0"
sfv = "0.15"
sha3 = "0.10.0"
slab = "0.4.7"
sled = "0.34.7"
Expand Down
4 changes: 2 additions & 2 deletions crates/bench/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# Set up to run from linux / WSL (running from a windows file system will be extremely slow).
# See the README for commands to run.

# sync with: ../../rust-toolchain.toml
FROM rust:1.93.0
# !rust-toolchain-sync
FROM rust:1.96.1

RUN apt-get update && \
apt-get install -y valgrind bash && \
Expand Down
12 changes: 6 additions & 6 deletions crates/bindings/tests/ui/environment_enum.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ error: expected string literal
38 | #[env(value = 1)]
| ^

error[E0277]: the trait bound `Option<Mode>: RequiredEnvironmentValue` is not satisfied
error[E0277]: the trait bound `Option<Mode>: spacetimedb::rt::RequiredEnvironmentValue` is not satisfied
--> tests/ui/environment_enum.rs:51:17
|
51 | pub NESTED: Option<Option<Mode>>,
| ^^^^^^^^^^^^^^^^^^^^ the trait `RequiredEnvironmentValue` is not implemented for `Option<Mode>`
| ^^^^^^^^^^^^^^^^^^^^ the trait `spacetimedb::rt::RequiredEnvironmentValue` is not implemented for `Option<Mode>`
|
help: the following other types implement trait `RequiredEnvironmentValue`
help: the following other types implement trait `spacetimedb::rt::RequiredEnvironmentValue`
--> tests/ui/environment_enum.rs:42:10
|
42 | #[derive(spacetimedb::EnvironmentValue)]
Expand All @@ -62,7 +62,7 @@ help: the following other types implement trait `RequiredEnvironmentValue`
|
| impl RequiredEnvironmentValue for String {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `std::string::String`
= note: required for `Option<Option<Mode>>` to implement `EnvironmentValue`
= note: required for `Option<Option<Mode>>` to implement `spacetimedb::rt::EnvironmentValue`
= note: this error originates in the derive macro `spacetimedb::EnvironmentValue` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0277]: `#[env(values(...))]` requires `String` or `Option<String>`; map enum variants with `#[env(value = "...")]` instead
Expand All @@ -71,12 +71,12 @@ error[E0277]: `#[env(values(...))]` requires `String` or `Option<String>`; map e
50 | pub MODE: Mode,
| ^^^^ unsatisfied trait bound
|
help: the trait `StringEnvironmentValue` is not implemented for `Mode`
help: the trait `spacetimedb::rt::StringEnvironmentValue` is not implemented for `Mode`
--> tests/ui/environment_enum.rs:43:1
|
43 | pub enum Mode {
| ^^^^^^^^^^^^^
help: the following other types implement trait `StringEnvironmentValue`
help: the following other types implement trait `spacetimedb::rt::StringEnvironmentValue`
--> src/rt.rs
|
| impl StringEnvironmentValue for String {}
Expand Down
24 changes: 12 additions & 12 deletions crates/bindings/tests/ui/environment_types.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ error[E0277]: environment fields must be `String`, an enum deriving `Environment
6 | pub VALUE: String,
| ^^^^^^ unsatisfied trait bound
|
help: the trait `EnvironmentValue` is not implemented for `shadowed_string::String`
help: the trait `spacetimedb::rt::EnvironmentValue` is not implemented for `shadowed_string::String`
--> tests/ui/environment_types.rs:2:5
|
2 | pub struct String;
| ^^^^^^^^^^^^^^^^^
help: the following other types implement trait `EnvironmentValue`
help: the following other types implement trait `spacetimedb::rt::EnvironmentValue`
--> src/rt.rs
|
| impl EnvironmentValue for String {
Expand All @@ -24,12 +24,12 @@ error[E0277]: environment fields must be `String`, an enum deriving `Environment
15 | pub VALUE: Option<String>,
| ^^^^^^^^^^^^^^ unsatisfied trait bound
|
help: the trait `EnvironmentValue` is not implemented for `shadowed_option::Option<std::string::String>`
help: the trait `spacetimedb::rt::EnvironmentValue` is not implemented for `shadowed_option::Option<std::string::String>`
--> tests/ui/environment_types.rs:11:5
|
11 | pub struct Option<T>(T);
| ^^^^^^^^^^^^^^^^^^^^
help: the following other types implement trait `EnvironmentValue`
help: the following other types implement trait `spacetimedb::rt::EnvironmentValue`
--> src/rt.rs
|
| impl EnvironmentValue for String {
Expand All @@ -42,9 +42,9 @@ error[E0277]: environment fields must be `String`, an enum deriving `Environment
--> tests/ui/environment_types.rs:21:15
|
21 | pub BOOL: bool,
| ^^^^ the trait `EnvironmentValue` is not implemented for `bool`
| ^^^^ the trait `spacetimedb::rt::EnvironmentValue` is not implemented for `bool`
|
help: the following other types implement trait `EnvironmentValue`
help: the following other types implement trait `spacetimedb::rt::EnvironmentValue`
--> src/rt.rs
|
| impl EnvironmentValue for String {
Expand All @@ -53,26 +53,26 @@ help: the following other types implement trait `EnvironmentValue`
| impl<T: RequiredEnvironmentValue> EnvironmentValue for Option<T> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `std::option::Option<T>`

error[E0277]: the trait bound `std::option::Option<std::string::String>: RequiredEnvironmentValue` is not satisfied
error[E0277]: the trait bound `std::option::Option<std::string::String>: spacetimedb::rt::RequiredEnvironmentValue` is not satisfied
--> tests/ui/environment_types.rs:22:17
|
22 | pub NESTED: Option<Option<String>>,
| ^^^^^^^^^^^^^^^^^^^^^^ the trait `RequiredEnvironmentValue` is not implemented for `std::option::Option<std::string::String>`
| ^^^^^^^^^^^^^^^^^^^^^^ the trait `spacetimedb::rt::RequiredEnvironmentValue` is not implemented for `std::option::Option<std::string::String>`
|
help: the trait `RequiredEnvironmentValue` is implemented for `std::string::String`
help: the trait `spacetimedb::rt::RequiredEnvironmentValue` is implemented for `std::string::String`
--> src/rt.rs
|
| impl RequiredEnvironmentValue for String {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= note: required for `std::option::Option<std::option::Option<std::string::String>>` to implement `EnvironmentValue`
= note: required for `std::option::Option<std::option::Option<std::string::String>>` to implement `spacetimedb::rt::EnvironmentValue`

error[E0277]: environment fields must be `String`, an enum deriving `EnvironmentValue`, or an `Option` of either
--> tests/ui/environment_types.rs:24:14
|
24 | pub get: u32,
| ^^^ the trait `EnvironmentValue` is not implemented for `u32`
| ^^^ the trait `spacetimedb::rt::EnvironmentValue` is not implemented for `u32`
|
help: the following other types implement trait `EnvironmentValue`
help: the following other types implement trait `spacetimedb::rt::EnvironmentValue`
--> src/rt.rs
|
| impl EnvironmentValue for String {
Expand Down
Loading
Loading