Skip to content

Commit c12fa3c

Browse files
committed
update wit-bindgen version for test components
Signed-off-by: Joel Dice <[email protected]>
1 parent 8025952 commit c12fa3c

File tree

13 files changed

+41
-227
lines changed

13 files changed

+41
-227
lines changed

tests/test-components/components/Cargo.lock

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

tests/test-components/components/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ exclude = ["target"]
44
resolver = "2"
55

66
[workspace.dependencies]
7-
wit-bindgen = "0.34.0"
7+
wit-bindgen = { version = "0.46.0", features = ["async"] }
Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
use anyhow::{anyhow, Result};
22
use helper::ensure_some;
3-
use spin_sdk::{http_component, http::{Request, Response}};
3+
use spin_sdk::{
4+
http::{Request, Response},
5+
http_component,
6+
};
47

58
#[http_component]
69
fn test_routing_headers(req: Request) -> Result<Response> {
@@ -13,15 +16,10 @@ fn test_routing_headers_impl(req: Request) -> Result<Response, String> {
1316
.and_then(|v| v.as_str());
1417
let header_userid = ensure_some!(header_userid);
1518

16-
let trailing = req
17-
.header("spin-path-info")
18-
.and_then(|v| v.as_str());
19+
let trailing = req.header("spin-path-info").and_then(|v| v.as_str());
1920
let trailing = ensure_some!(trailing);
2021

2122
let response = format!("{header_userid}:{trailing}");
2223

23-
Ok(Response::builder()
24-
.status(200)
25-
.body(response)
26-
.build())
24+
Ok(Response::builder().status(200).body(response).build())
2725
}

tests/test-components/components/integration-wasi-http-p3-streaming/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ futures = "0.3.31"
1111
hex = "0.4.3"
1212
sha2 = "0.10.9"
1313
url = "2.5.7"
14-
wit-bindgen = { version = "0.46.0", features = ["async"] }
14+
wit-bindgen = { workspace = true }
1515

tests/test-components/components/integration-wasi-http-p3-streaming/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ use {
1616
},
1717
},
1818
core::mem,
19-
futures::{StreamExt, stream},
19+
futures::{stream, StreamExt},
2020
url::Url,
21-
wit_bindgen::{StreamResult, rt::async_support},
21+
wit_bindgen::{rt::async_support, StreamResult},
2222
};
2323

2424
const MAX_CONCURRENCY: usize = 16;

tests/test-components/components/integration-wasi-http-v0.2.0-rc-2023-11-10/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ impl incoming_handler::Guest for Component {
3434
.and_then(|v| Url::parse(v).ok())
3535
}) {
3636
let headers = Headers::new();
37-
headers
38-
.append(&"Content-Length".into(), &"13".into())
39-
.unwrap();
37+
headers.append("Content-Length", b"13").unwrap();
4038
let outgoing_request = OutgoingRequest::new(headers);
4139
outgoing_request.set_method(&Method::Post).unwrap();
4240
outgoing_request

tests/test-components/components/integration-wasi-http-v0.2.0/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ impl incoming_handler::Guest for Component {
3434
.and_then(|v| Url::parse(v).ok())
3535
}) {
3636
let headers = Headers::new();
37-
headers
38-
.append(&"Content-Length".into(), &"13".into())
39-
.unwrap();
37+
headers.append("Content-Length", b"13").unwrap();
4038
let outgoing_request = OutgoingRequest::new(headers);
4139
outgoing_request.set_method(&Method::Post).unwrap();
4240
outgoing_request

tests/test-components/components/llm/src/lib.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ impl Component {
1313
top_k: 1,
1414
top_p: 1.0,
1515
};
16-
let inference = ensure_ok!(llm::infer(
17-
&"llama2-chat".to_owned(),
18-
"say hello",
19-
Some(param)
20-
));
16+
let inference = ensure_ok!(llm::infer("llama2-chat", "say hello", Some(param)));
2117

2218
ensure!(!inference.text.is_empty());
2319
ensure_eq!(inference.usage.generated_token_count, 1);

tests/test-components/components/outbound-mqtt/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ impl Component {
2424
keep_alive_interval
2525
));
2626

27-
ensure_ok!(connection.publish("telemetry-topic", &b"Eureka!".to_vec(), Qos::AtLeastOnce));
27+
ensure_ok!(connection.publish("telemetry-topic", b"Eureka!", Qos::AtLeastOnce));
2828

2929
Ok(())
3030
}

tests/test-components/components/outbound-postgres/src/lib.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,11 @@ fn json_types(conn: &postgres::Connection) -> Result<postgres::RowSet, postgres:
219219
(2, $1);
220220
"#;
221221

222-
let jsonb_pv = postgres::ParameterValue::Jsonb(r#"{ "s": "world", "n": 234, "b": false, "x": null }"#.as_bytes().to_vec());
222+
let jsonb_pv = postgres::ParameterValue::Jsonb(
223+
r#"{ "s": "world", "n": 234, "b": false, "x": null }"#
224+
.as_bytes()
225+
.to_vec(),
226+
);
223227
conn.execute(insert_sql_spin_parameters, &[jsonb_pv])?;
224228

225229
let sql = r#"

0 commit comments

Comments
 (0)