Skip to content

Commit 699dbe7

Browse files
authored
Merge branch 'main' into 3257-humantime-time-values
2 parents 78a2176 + 1860bc3 commit 699dbe7

File tree

5 files changed

+30
-19
lines changed

5 files changed

+30
-19
lines changed

examples/rust/components/blobby/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ fn put_object(
232232
.to_string(),
233233
)
234234
} else {
235+
OutgoingValue::finish(result_value).map_err(|e| e.to_string())?;
235236
Ok(())
236237
}
237238
}

examples/rust/components/blobby/wit/deps/wasi-io-0.2.1/package.wit

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
package wasi:io@0.2.1;
22

3+
interface error {
4+
resource error {
5+
to-debug-string: func() -> string;
6+
}
7+
}
8+
39
interface poll {
410
resource pollable {
511
ready: func() -> bool;
@@ -9,12 +15,6 @@ interface poll {
915
poll: func(in: list<borrow<pollable>>) -> list<u32>;
1016
}
1117

12-
interface error {
13-
resource error {
14-
to-debug-string: func() -> string;
15-
}
16-
}
17-
1818
interface streams {
1919
use error.{error};
2020
use poll.{pollable};

examples/rust/components/http-password-checker/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ crate-type = ["cdylib"]
1212
anyhow = "1.0.92"
1313
# NOTE: While we'd *like* to use zxcvbn here, it is built strictly for browser-side WASM
1414
passwords = { version = "3.1.16", default-features = false }
15-
serde = { version = "1.0.214", default-features = false, features = ["derive"] }
15+
serde = { version = "1.0.214", default-features = false, features = ["derive", "alloc"] }
1616
serde_json = { version = "1.0.132", default-features = false, features = [ "std" ] }
1717
wasmcloud-component = "0.2.0"
1818
wit-bindgen = { version = "0.34" }

nix/images/default.nix

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
debian-amd64.arch = "amd64";
33
debian-amd64.finalImageName = "debian";
44
debian-amd64.finalImageTag = "12-slim";
5-
debian-amd64.imageDigest = "sha256:b1a741487078b369e78119849663d7f1a5341ef2768798f7b7406c4240f86aef";
5+
debian-amd64.imageDigest = "sha256:df52e55e3361a81ac1bead266f3373ee55d29aa50cf0975d440c2be3483d8ed3";
66
debian-amd64.imageName = "debian";
7-
debian-amd64.sha256 = "sha256-3z/L7P4BobwFEpk4eUpU1KjsK07rofb42skzwxn7kx0=";
7+
debian-amd64.sha256 = "sha256-L0/IEfI6OiaxkjIUV8llN0dZXFyWFSEcXOQtE7oaYVM=";
88
debian-arm64.arch = "arm64";
99
debian-arm64.finalImageName = "debian";
1010
debian-arm64.finalImageTag = "12-slim";
11-
debian-arm64.imageDigest = "sha256:b1a741487078b369e78119849663d7f1a5341ef2768798f7b7406c4240f86aef";
11+
debian-arm64.imageDigest = "sha256:df52e55e3361a81ac1bead266f3373ee55d29aa50cf0975d440c2be3483d8ed3";
1212
debian-arm64.imageName = "debian";
13-
debian-arm64.sha256 = "sha256-utpemzIt/st6EZbOwh2wxpophyQePBEedkhRdVn/q8M=";
13+
debian-arm64.sha256 = "sha256-uZRfWRWEx51l0n1Kr37hc7iMyAdFluoNBU/ouZ0IGzc=";
1414
wolfi-amd64.arch = "amd64";
1515
wolfi-amd64.finalImageName = "cgr.dev/chainguard/wolfi-base";
1616
wolfi-amd64.finalImageTag = "latest";
17-
wolfi-amd64.imageDigest = "sha256:c85f493847f2a370df7f351676bbbbc89096c139394a1dca6a4b05f5f1108d3a";
17+
wolfi-amd64.imageDigest = "sha256:0e09bcd548cf2dfb9a3fd40af1a7389aa8c16b428de4e8f72b085f015694ce3d";
1818
wolfi-amd64.imageName = "cgr.dev/chainguard/wolfi-base";
19-
wolfi-amd64.sha256 = "sha256-n1LiD5yt6W1zO2osD4VGO+alOkKR7uxj45P9s31p7Eo=";
19+
wolfi-amd64.sha256 = "sha256-nbjhqpPWONN7wwhyZD3aEdIhKldlo840py4fmA2qyBw=";
2020
wolfi-arm64.arch = "arm64";
2121
wolfi-arm64.finalImageName = "cgr.dev/chainguard/wolfi-base";
2222
wolfi-arm64.finalImageTag = "latest";
23-
wolfi-arm64.imageDigest = "sha256:c85f493847f2a370df7f351676bbbbc89096c139394a1dca6a4b05f5f1108d3a";
23+
wolfi-arm64.imageDigest = "sha256:0e09bcd548cf2dfb9a3fd40af1a7389aa8c16b428de4e8f72b085f015694ce3d";
2424
wolfi-arm64.imageName = "cgr.dev/chainguard/wolfi-base";
25-
wolfi-arm64.sha256 = "sha256-EkCSTTWwJoH9CMFoCkqsj/0cbrwPm1B7e3eX2VE6PTI=";
25+
wolfi-arm64.sha256 = "sha256-R2xQA+XM8ApCmwlP3WxeU2toNRVTAixMmRbZXTwk8l0=";
2626
}

tests/components/rust/Cargo.lock

Lines changed: 14 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)