1
1
use crate :: sdkman:: candidate:: { Candidate , SdkManCandidate } ;
2
+ use expect_exit:: Expected ;
2
3
use std:: fs:: read_dir;
3
4
use std:: io:: Write ;
4
5
use std:: path:: Path ;
@@ -27,7 +28,7 @@ impl ToolManager for SdkMan {
27
28
let base = Path :: new ( dir. as_str ( ) ) . join ( "candidates" ) . join ( candidate) ;
28
29
if base. is_dir ( ) {
29
30
read_dir ( base)
30
- . expect ( "Failed to read $SDKMAN_DIR" )
31
+ . or_exit_ ( "Failed to read $SDKMAN_DIR" )
31
32
. filter ( |entry| entry. as_ref ( ) . unwrap ( ) . file_type ( ) . unwrap ( ) . is_dir ( ) )
32
33
. map ( |entry| entry. unwrap ( ) . file_name ( ) . into_string ( ) . unwrap ( ) )
33
34
. collect ( )
@@ -49,7 +50,7 @@ impl ToolManager for SdkMan {
49
50
. arg ( "-c" )
50
51
. arg ( format ! ( "sdk list {}" , candidate) )
51
52
. output ( )
52
- . expect ( "Failed to run the sdk list command. Is SDKMAN installed?" ) ;
53
+ . or_exit_ ( "Failed to run the sdk list command. Is SDKMAN installed?" ) ;
53
54
if output. status . success ( ) {
54
55
SdkManCandidate {
55
56
name : candidate,
@@ -77,7 +78,7 @@ impl ToolManager for SdkMan {
77
78
. arg ( "-c" )
78
79
. arg ( cmd)
79
80
. output ( )
80
- . expect ( "Error running sdk install command" ) ;
81
+ . or_exit_ ( "Error running sdk install command" ) ;
81
82
if output. status . success ( ) {
82
83
println ! ( "OK" ) ;
83
84
} else {
@@ -106,7 +107,7 @@ impl ToolManager for SdkMan {
106
107
. arg ( "-c" )
107
108
. arg ( cmd)
108
109
. output ( )
109
- . expect ( "Error running sdk install command" ) ;
110
+ . or_exit_ ( "Error running sdk install command" ) ;
110
111
if output. status . success ( ) {
111
112
println ! ( "OK" ) ;
112
113
} else {
@@ -133,7 +134,7 @@ impl ToolManager for SdkMan {
133
134
. arg ( "-c" )
134
135
. arg ( cmd)
135
136
. output ( )
136
- . expect ( "Error running sdk install command" ) ;
137
+ . or_exit_ ( "Error running sdk install command" ) ;
137
138
if output. status . success ( ) {
138
139
println ! ( "OK" ) ;
139
140
} else {
0 commit comments