@@ -89,7 +89,7 @@ impl Client {
89
89
}
90
90
91
91
pub unsafe fn open ( s : & str ) -> Result < Client , ErrFromEnv > {
92
- Ok ( Self :: from_fifo ( s) ?. unwrap_or ( Self :: from_pipe ( s) ?. ok_or ( ErrFromEnv :: ParseEnvVar ) ? ) )
92
+ Ok ( Self :: from_fifo ( s) ?. unwrap_or ( Self :: from_pipe ( s) ?) )
93
93
}
94
94
95
95
/// `--jobserver-auth=fifo:PATH`
@@ -110,7 +110,7 @@ impl Client {
110
110
}
111
111
112
112
/// `--jobserver-auth=R,W`
113
- unsafe fn from_pipe ( s : & str ) -> Result < Option < Client > , ErrFromEnv > {
113
+ unsafe fn from_pipe ( s : & str ) -> Result < Client , ErrFromEnv > {
114
114
let mut parts = s. splitn ( 2 , ',' ) ;
115
115
let read = parts. next ( ) . unwrap ( ) ;
116
116
let write = parts. next ( ) . ok_or ( ErrFromEnv :: ParseEnvVar ) ?;
@@ -128,7 +128,7 @@ impl Client {
128
128
if check_fd ( read) && check_fd ( write) {
129
129
drop ( set_cloexec ( read, true ) ) ;
130
130
drop ( set_cloexec ( write, true ) ) ;
131
- Ok ( Some ( Client :: from_fds ( read, write) ) )
131
+ Ok ( Client :: from_fds ( read, write) )
132
132
} else {
133
133
Err ( ErrFromEnv :: InvalidDescriptor ( read, write) )
134
134
}
0 commit comments