@@ -36,8 +36,6 @@ pub enum FromEnvErrorKind {
3636 NotAPipe ,
3737 /// Jobserver inheritance is not supported on this platform.
3838 Unsupported ,
39- /// Cannot clone the jobserver fifo fd
40- CannotClone ,
4139}
4240
4341impl FromEnvError {
@@ -52,7 +50,6 @@ impl FromEnvError {
5250 FromEnvErrorInner :: NegativeFd ( ..) => FromEnvErrorKind :: NegativeFd ,
5351 FromEnvErrorInner :: NotAPipe ( ..) => FromEnvErrorKind :: NotAPipe ,
5452 FromEnvErrorInner :: Unsupported => FromEnvErrorKind :: Unsupported ,
55- FromEnvErrorInner :: CannotClone ( ..) => FromEnvErrorKind :: CannotClone ,
5653 }
5754 }
5855}
@@ -69,17 +66,16 @@ impl std::fmt::Display for FromEnvError {
6966 FromEnvErrorInner :: NotAPipe ( fd, None ) => write ! ( f, "file descriptor {fd} from the jobserver environment variable value is not a pipe" ) ,
7067 FromEnvErrorInner :: NotAPipe ( fd, Some ( err) ) => write ! ( f, "file descriptor {fd} from the jobserver environment variable value is not a pipe: {err}" ) ,
7168 FromEnvErrorInner :: Unsupported => write ! ( f, "jobserver inheritance is not supported on this platform" ) ,
72- FromEnvErrorInner :: CannotClone ( fd, err) => write ! ( f, "file descriptor {fd} created fromjobserver environment variable value cannot be cloned: {err}" ) ,
7369 }
7470 }
7571}
7672impl std:: error:: Error for FromEnvError {
7773 fn source ( & self ) -> Option < & ( dyn std:: error:: Error + ' static ) > {
7874 match & self . inner {
7975 FromEnvErrorInner :: CannotOpenPath ( _, err) => Some ( err) ,
80- FromEnvErrorInner :: NotAPipe ( _, Some ( err) )
81- | FromEnvErrorInner :: CannotOpenFd ( _ , err)
82- | FromEnvErrorInner :: CannotClone ( _ , err ) => Some ( err ) ,
76+ FromEnvErrorInner :: NotAPipe ( _, Some ( err) ) | FromEnvErrorInner :: CannotOpenFd ( _ , err ) => {
77+ Some ( err)
78+ }
8379 _ => None ,
8480 }
8581 }
@@ -96,5 +92,4 @@ pub(crate) enum FromEnvErrorInner {
9692 NegativeFd ( RawFd ) ,
9793 NotAPipe ( RawFd , Option < std:: io:: Error > ) ,
9894 Unsupported ,
99- CannotClone ( RawFd , std:: io:: Error ) ,
10095}
0 commit comments