@@ -7,8 +7,8 @@ use std::str::FromStr;
7
7
#[ async_std:: test]
8
8
async fn nested ( ) {
9
9
let mut inner = tide:: new ( ) ;
10
- inner. at ( "/foo" ) . get ( |_| async { "foo" } ) ;
11
- inner. at ( "/bar" ) . get ( |_| async { "bar" } ) ;
10
+ inner. at ( "/foo" ) . get ( |_| async { Ok ( "foo" ) } ) ;
11
+ inner. at ( "/bar" ) . get ( |_| async { Ok ( "bar" ) } ) ;
12
12
13
13
let mut outer = tide:: new ( ) ;
14
14
// Nest the inner app on /foo
@@ -35,17 +35,18 @@ async fn nested() {
35
35
36
36
#[ async_std:: test]
37
37
async fn nested_middleware ( ) {
38
- let echo_path = |req : tide:: Request < ( ) > | async move { req. uri ( ) . path ( ) . to_string ( ) } ;
38
+ let echo_path = |req : tide:: Request < ( ) > | async move { Ok ( req. uri ( ) . path ( ) . to_string ( ) ) } ;
39
39
fn test_middleware (
40
40
req : tide:: Request < ( ) > ,
41
41
next : tide:: Next < ' _ , ( ) > ,
42
- ) -> BoxFuture < ' _ , tide:: Response > {
42
+ ) -> BoxFuture < ' _ , tide:: Result < tide :: Response > > {
43
43
Box :: pin ( async move {
44
- let res = next. run ( req) . await ;
45
- res. set_header (
44
+ let res = next. run ( req) . await ? ;
45
+ let res = res. set_header (
46
46
HeaderName :: from_ascii ( "X-Tide-Test" . to_owned ( ) . into_bytes ( ) ) . unwrap ( ) ,
47
47
"1" ,
48
- )
48
+ ) ;
49
+ Ok ( res)
49
50
} )
50
51
}
51
52
@@ -92,9 +93,9 @@ async fn nested_with_different_state() {
92
93
let mut inner = tide:: with_state ( 42 ) ;
93
94
inner. at ( "/" ) . get ( |req : tide:: Request < i32 > | async move {
94
95
let num = req. state ( ) ;
95
- format ! ( "the number is {}" , num)
96
+ Ok ( format ! ( "the number is {}" , num) )
96
97
} ) ;
97
- outer. at ( "/" ) . get ( |_| async move { "Hello, world!" } ) ;
98
+ outer. at ( "/" ) . get ( |_| async move { Ok ( "Hello, world!" ) } ) ;
98
99
outer. at ( "/foo" ) . nest ( inner) ;
99
100
100
101
let mut server = make_server ( outer. into_http_service ( ) ) . unwrap ( ) ;
0 commit comments