@@ -265,9 +265,7 @@ fn migrate_manifests(ws: &Workspace<'_>, pkgs: &[&Package]) -> CargoResult<()> {
265
265
}
266
266
267
267
fixes += add_feature_for_unused_deps ( pkg, root) ;
268
- if rename_table ( root, "project" , "package" ) {
269
- fixes += 1 ;
270
- }
268
+ fixes += rename_table ( root, "project" , "package" ) ;
271
269
if let Some ( target) = root. get_mut ( "lib" ) . and_then ( |t| t. as_table_like_mut ( ) ) {
272
270
fixes += rename_target_fields_2024 ( target) ;
273
271
}
@@ -276,13 +274,9 @@ fn migrate_manifests(ws: &Workspace<'_>, pkgs: &[&Package]) -> CargoResult<()> {
276
274
fixes += rename_array_of_target_fields_2024 ( root, "test" ) ;
277
275
fixes += rename_array_of_target_fields_2024 ( root, "bench" ) ;
278
276
fixes += rename_dep_fields_2024 ( root, "dependencies" ) ;
279
- if rename_table ( root, "dev_dependencies" , "dev-dependencies" ) {
280
- fixes += 1 ;
281
- }
277
+ fixes += rename_table ( root, "dev_dependencies" , "dev-dependencies" ) ;
282
278
fixes += rename_dep_fields_2024 ( root, "dev-dependencies" ) ;
283
- if rename_table ( root, "build_dependencies" , "build-dependencies" ) {
284
- fixes += 1 ;
285
- }
279
+ fixes += rename_table ( root, "build_dependencies" , "build-dependencies" ) ;
286
280
fixes += rename_dep_fields_2024 ( root, "build-dependencies" ) ;
287
281
for target in root
288
282
. get_mut ( "target" )
@@ -292,13 +286,9 @@ fn migrate_manifests(ws: &Workspace<'_>, pkgs: &[&Package]) -> CargoResult<()> {
292
286
. filter_map ( |( _k, t) | t. as_table_like_mut ( ) )
293
287
{
294
288
fixes += rename_dep_fields_2024 ( target, "dependencies" ) ;
295
- if rename_table ( target, "dev_dependencies" , "dev-dependencies" ) {
296
- fixes += 1 ;
297
- }
289
+ fixes += rename_table ( target, "dev_dependencies" , "dev-dependencies" ) ;
298
290
fixes += rename_dep_fields_2024 ( target, "dev-dependencies" ) ;
299
- if rename_table ( target, "build_dependencies" , "build-dependencies" ) {
300
- fixes += 1 ;
301
- }
291
+ fixes += rename_table ( target, "build_dependencies" , "build-dependencies" ) ;
302
292
fixes += rename_dep_fields_2024 ( target, "build-dependencies" ) ;
303
293
}
304
294
@@ -326,9 +316,7 @@ fn rename_dep_fields_2024(parent: &mut dyn toml_edit::TableLike, dep_kind: &str)
326
316
. flat_map ( |t| t. iter_mut ( ) )
327
317
. filter_map ( |( _k, t) | t. as_table_like_mut ( ) )
328
318
{
329
- if rename_table ( target, "default_features" , "default-features" ) {
330
- fixes += 1 ;
331
- }
319
+ fixes += rename_table ( target, "default_features" , "default-features" ) ;
332
320
}
333
321
fixes
334
322
}
@@ -348,18 +336,14 @@ fn rename_array_of_target_fields_2024(root: &mut dyn toml_edit::TableLike, kind:
348
336
349
337
fn rename_target_fields_2024 ( target : & mut dyn toml_edit:: TableLike ) -> usize {
350
338
let mut fixes = 0 ;
351
- if rename_table ( target, "crate_type" , "crate-type" ) {
352
- fixes += 1 ;
353
- }
354
- if rename_table ( target, "proc_macro" , "proc-macro" ) {
355
- fixes += 1 ;
356
- }
339
+ fixes += rename_table ( target, "crate_type" , "crate-type" ) ;
340
+ fixes += rename_table ( target, "proc_macro" , "proc-macro" ) ;
357
341
fixes
358
342
}
359
343
360
- fn rename_table ( parent : & mut dyn toml_edit:: TableLike , old : & str , new : & str ) -> bool {
344
+ fn rename_table ( parent : & mut dyn toml_edit:: TableLike , old : & str , new : & str ) -> usize {
361
345
let Some ( old_key) = parent. key ( old) . cloned ( ) else {
362
- return false ;
346
+ return 0 ;
363
347
} ;
364
348
365
349
let project = parent. remove ( old) . expect ( "returned early" ) ;
@@ -369,7 +353,7 @@ fn rename_table(parent: &mut dyn toml_edit::TableLike, old: &str, new: &str) ->
369
353
* new_key. dotted_decor_mut ( ) = old_key. dotted_decor ( ) . clone ( ) ;
370
354
* new_key. leaf_decor_mut ( ) = old_key. leaf_decor ( ) . clone ( ) ;
371
355
}
372
- true
356
+ 1
373
357
}
374
358
375
359
fn add_feature_for_unused_deps ( pkg : & Package , parent : & mut dyn toml_edit:: TableLike ) -> usize {
0 commit comments