File tree Expand file tree Collapse file tree 1 file changed +3
-6
lines changed Expand file tree Collapse file tree 1 file changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -177,8 +177,7 @@ root-fs-type = "xfs"
177
177
let other = InstallConfigurationToplevel {
178
178
install : Some ( InstallConfiguration {
179
179
root_fs_type : Some ( Filesystem :: Ext4 ) ,
180
- filesystem : None ,
181
- kargs : None ,
180
+ ..Default :: default ( )
182
181
} ) ,
183
182
} ;
184
183
install. merge ( other. install . unwrap ( ) ) ;
@@ -206,14 +205,13 @@ kargs = ["console=ttyS0", "foo=bar"]
206
205
assert_eq ! ( install. root_fs_type. unwrap( ) , Filesystem :: Ext4 ) ;
207
206
let other = InstallConfigurationToplevel {
208
207
install : Some ( InstallConfiguration {
209
- root_fs_type : None ,
210
- filesystem : None ,
211
208
kargs : Some (
212
209
[ "console=tty0" , "nosmt" ]
213
210
. into_iter ( )
214
211
. map ( ToOwned :: to_owned)
215
212
. collect ( ) ,
216
213
) ,
214
+ ..Default :: default ( )
217
215
} ) ,
218
216
} ;
219
217
install. merge ( other. install . unwrap ( ) ) ;
@@ -245,13 +243,12 @@ type = "xfs"
245
243
) ;
246
244
let other = InstallConfigurationToplevel {
247
245
install : Some ( InstallConfiguration {
248
- root_fs_type : None ,
249
246
filesystem : Some ( BasicFilesystems {
250
247
root : Some ( RootFS {
251
248
fstype : Some ( Filesystem :: Ext4 ) ,
252
249
} ) ,
253
250
} ) ,
254
- kargs : None ,
251
+ .. Default :: default ( )
255
252
} ) ,
256
253
} ;
257
254
install. merge ( other. install . unwrap ( ) ) ;
You can’t perform that action at this time.
0 commit comments