Skip to content

Commit 38d6c23

Browse files
committed
update dep, simplify examples
1 parent c561ca3 commit 38d6c23

File tree

9 files changed

+19
-33
lines changed

9 files changed

+19
-33
lines changed

examples/cron/Cargo.lock

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/cron/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ serde = { version = "1.0.145", features = ["derive"] }
1212
serde_json = { version = "1.0.86", features = ["raw_value"] }
1313
serde_derive = "1.0.9"
1414
rand = "0.8.5"
15-
vercel_runtime = "0.1.3"
15+
vercel_runtime = "0.1.4"
1616
slack-morphism = { version = "1.2.2", features = ["hyper"] }
1717

1818
[[bin]]

examples/cron/api/cron.rs

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
use slack_morphism::{errors::SlackClientError, prelude::*};
22
use vercel_runtime::{
3-
lambda_http::{
4-
http::{Error, StatusCode},
5-
Error as LambdaError, Response,
6-
},
7-
run, IntoResponse, Request,
3+
lambda_http::{http::StatusCode, Response},
4+
run, Error, IntoResponse, Request,
85
};
96

107
#[derive(Debug, Clone)]
118
pub struct SlackMessage {}
129

1310
impl SlackMessageTemplate for SlackMessage {
1411
fn render_template(&self) -> SlackMessageContent {
15-
SlackMessageContent::new().with_blocks(slack_blocks![some_into(SlackContextBlock::new(
16-
slack_blocks![some(md!("你好, 世界!"))]
17-
))])
12+
SlackMessageContent::new().with_blocks(slack_blocks![some_into(
13+
SlackSectionBlock::new().with_text(md!("你好, 世界!".to_owned()))
14+
)])
1815
}
1916
}
2017

@@ -37,22 +34,21 @@ impl<T: SlackClientHttpConnector + Send + Sync> Lambda<'_, T> {
3734
pub async fn handler(&self, _req: Request) -> Result<impl IntoResponse, Error> {
3835
let message = SlackMessage {};
3936

40-
self.post_message(&message, "#general").await.unwrap();
37+
self.post_message(&message, "#general").await?;
4138

4239
let response = Response::builder().status(StatusCode::OK).body(())?;
4340
Ok(response)
4441
}
4542
}
4643

4744
#[tokio::main]
48-
async fn main() -> Result<(), LambdaError> {
45+
async fn main() -> Result<(), Error> {
4946
let slack_client = SlackClient::new(SlackClientHyperConnector::new());
5047
let token_value: SlackApiTokenValue = std::env::var("SLACK_API_TOKEN")?.into();
5148
let token: SlackApiToken = SlackApiToken::new(token_value);
5249
let slack = slack_client.open_session(&token);
5350

5451
let lambda = Lambda { slack };
5552

56-
run(|e| lambda.handler(e)).await?;
57-
Ok(())
53+
run(|e| lambda.handler(e)).await
5854
}

examples/nextjs/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ serde = { version = "1.0.145", features = ["derive"] }
1212
serde_json = { version = "1.0.86", features = ["raw_value"] }
1313
serde_derive = "1.0.9"
1414
rand = "0.8.5"
15-
vercel_runtime = "0.1.3"
15+
vercel_runtime = "0.1.4"
1616
oorandom = "11.1.3"
1717

1818
[[bin]]

examples/nextjs/api/rust.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ use vercel_runtime::{
77

88
#[tokio::main]
99
async fn main() -> Result<(), LambdaError> {
10-
run(handler).await?;
11-
Ok(())
10+
run(handler).await
1211
}
1312

1413
pub async fn handler(_req: Request) -> Result<impl IntoResponse, Error> {

examples/simple/Cargo.lock

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/simple/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ serde = { version = "1.0.145", features = ["derive"] }
1111
serde_json = { version = "1.0.86", features = ["raw_value"] }
1212
serde_derive = "1.0.9"
1313
rand = "0.8.5"
14-
vercel_runtime = "0.1.3"
14+
vercel_runtime = "0.1.4"
1515

1616
[lib]
1717
path = "src-rs/lib.rs"

examples/simple/api/complex.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
use runtime_demo::choose_starter;
22
use serde_json::json;
33
use vercel_runtime::{
4-
lambda_http::{
5-
http::StatusCode, service_fn, tower::ServiceBuilder, Error as LambdaError, Response,
6-
},
7-
lambda_runtime, process_error, process_request, process_response, Error, IntoResponse, Request,
4+
lambda_http::{http::StatusCode, service_fn, tower::ServiceBuilder, Response},
5+
lambda_runtime, process_request, process_response, Error, IntoResponse, Request,
86
};
97

108
#[tokio::main]
11-
async fn main() -> Result<(), LambdaError> {
9+
async fn main() -> Result<(), Error> {
1210
tracing_subscriber::fmt()
1311
.with_max_level(tracing::Level::ERROR)
1412
// disable printing the name of the module in every log line.
@@ -19,11 +17,9 @@ async fn main() -> Result<(), LambdaError> {
1917
let handler = ServiceBuilder::new()
2018
.map_request(process_request)
2119
.map_response(process_response)
22-
.map_err(process_error)
2320
.service(service_fn(handler));
2421

25-
lambda_runtime::run(handler).await?;
26-
Ok(())
22+
lambda_runtime::run(handler).await
2723
}
2824

2925
pub async fn handler(_req: Request) -> Result<impl IntoResponse, Error> {

examples/simple/api/simple.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
use runtime_demo::choose_starter;
22
use serde_json::json;
33
use vercel_runtime::{
4-
lambda_http::{http::StatusCode, Error as LambdaError, Response},
4+
lambda_http::{http::StatusCode, Response},
55
run, Error, IntoResponse, Request,
66
};
77

88
#[tokio::main]
9-
async fn main() -> Result<(), LambdaError> {
10-
run(handler).await?;
11-
Ok(())
9+
async fn main() -> Result<(), Error> {
10+
run(handler).await
1211
}
1312

1413
pub async fn handler(_req: Request) -> Result<impl IntoResponse, Error> {

0 commit comments

Comments
 (0)