@@ -43,7 +43,7 @@ fn main() -> Result<()> {
43
43
let ncpus = num_cpus:: get ( ) ;
44
44
let limiter = Arc :: new ( Semaphore :: new ( ncpus as isize ) ) ;
45
45
46
- let matrix = Matrix :: from_yaml ( & workflow) ? ;
46
+ let matrix = Matrix :: from_yaml ( & workflow) ;
47
47
48
48
let mut children = vec ! [ ] ;
49
49
let state = State :: new ( matrix. envs . len ( ) ) ;
@@ -71,7 +71,7 @@ fn main() -> Result<()> {
71
71
child. join ( ) . unwrap ( ) ;
72
72
}
73
73
74
- println ! ( "" ) ;
74
+ println ! ( ) ;
75
75
76
76
Ok ( ( ) )
77
77
}
@@ -97,7 +97,7 @@ impl State {
97
97
Arc :: new ( Mutex :: new ( State {
98
98
running : HashSet :: new ( ) ,
99
99
done : HashSet :: new ( ) ,
100
- total : total ,
100
+ total,
101
101
} ) )
102
102
}
103
103
@@ -174,7 +174,7 @@ struct FeatureSet {
174
174
}
175
175
176
176
impl Matrix {
177
- fn from_yaml ( yaml : & [ Yaml ] ) -> Result < Matrix > {
177
+ fn from_yaml ( yaml : & [ Yaml ] ) -> Matrix {
178
178
let mut envs = vec ! [ ] ;
179
179
180
180
let mut all_tests = HashSet :: new ( ) ;
@@ -192,13 +192,7 @@ impl Matrix {
192
192
}
193
193
Some ( e) => e,
194
194
} ;
195
- let fset = match FeatureSet :: decode ( elt) {
196
- Ok ( fset) => fset,
197
- Err ( err) => {
198
- warn ! ( "Skipping: {:?}" , err) ;
199
- continue ;
200
- }
201
- } ;
195
+ let fset = FeatureSet :: decode ( elt) ;
202
196
203
197
if false {
204
198
// Respect the groupings in the `.workflow.yml` file.
@@ -222,23 +216,23 @@ impl Matrix {
222
216
}
223
217
}
224
218
225
- Ok ( Matrix {
226
- envs : envs ,
227
- } )
219
+ Matrix {
220
+ envs,
221
+ }
228
222
}
229
223
}
230
224
231
225
impl FeatureSet {
232
- fn decode ( text : & str ) -> Result < FeatureSet > {
226
+ fn decode ( text : & str ) -> FeatureSet {
233
227
// The github workflow is just a space separated set of values.
234
228
let values: Vec < _ > = text
235
229
. split ( ',' )
236
230
. map ( |s| s. to_string ( ) )
237
231
. collect ( ) ;
238
- Ok ( FeatureSet {
232
+ FeatureSet {
239
233
env : "MULTI_FEATURES" . to_string ( ) ,
240
- values : values ,
241
- } )
234
+ values,
235
+ }
242
236
}
243
237
244
238
/// Run a test for this given feature set. Output is captured and will be returned if there is
0 commit comments