44#[ path = "common.rs" ]
55mod common;
66
7- use netcorehost:: { nethost, pdcstr, utils:: altstack:: { self , State } } ;
8- use rusty_fork:: { ChildWrapper , ExitStatusWrapper , fork, rusty_fork_id} ;
9- use std:: { process:: Stdio , io:: Read } ;
7+ use netcorehost:: {
8+ nethost, pdcstr,
9+ utils:: altstack:: { self , State } ,
10+ } ;
11+ use rusty_fork:: { fork, rusty_fork_id, ChildWrapper , ExitStatusWrapper } ;
12+ use std:: { io:: Read , process:: Stdio } ;
1013
1114macro_rules! function_name {
1215 ( ) => { {
@@ -60,7 +63,7 @@ fn segfault_with_small_altstack() {
6063 |status, _, stderr| {
6164 assert_eq ! ( status. unix_signal( ) , Some ( libc:: SIGSEGV ) ) ;
6265 assert_not_contains ! ( stderr, MANAGED_HANDLER_OUTPUT ) ;
63- }
66+ } ,
6467 ) ;
6568}
6669
@@ -75,7 +78,7 @@ fn no_segfault_with_large_altstack() {
7578 |status, _, stderr| {
7679 assert_ne ! ( status. unix_signal( ) , Some ( libc:: SIGSEGV ) ) ;
7780 assert_contains ! ( stderr, MANAGED_HANDLER_OUTPUT ) ;
78- }
81+ } ,
7982 ) ;
8083}
8184
@@ -90,14 +93,14 @@ fn no_segfault_with_altstack_disabled() {
9093 |status, _, stderr| {
9194 assert_ne ! ( status. unix_signal( ) , Some ( libc:: SIGSEGV ) ) ;
9295 assert_contains ! ( stderr, MANAGED_HANDLER_OUTPUT ) ;
93- }
96+ } ,
9497 ) ;
9598}
9699
97100fn altstack_test (
98101 test_name : & str ,
99102 configure_altstack : impl FnOnce ( ) ,
100- verify : impl FnOnce ( ExitStatusWrapper , /* stdout */ String , /* stderr */ String )
103+ verify : impl FnOnce ( ExitStatusWrapper , /* stdout */ String , /* stderr */ String ) ,
101104) {
102105 common:: setup ( ) ;
103106
@@ -137,7 +140,7 @@ fn altstack_test(
137140 . unwrap ( )
138141 . read_to_string ( & mut stdout)
139142 . unwrap ( ) ;
140-
143+
141144 let mut stderr = String :: new ( ) ;
142145 child
143146 . inner_mut ( )
@@ -161,5 +164,6 @@ fn altstack_test(
161164 configure_child,
162165 supervise,
163166 body,
164- ) . expect ( "fork failed" ) ;
167+ )
168+ . expect ( "fork failed" ) ;
165169}
0 commit comments