Skip to content

Commit 6198dae

Browse files
committed
fix(willbe): long lines
1 parent 3af12ed commit 6198dae

File tree

2 files changed

+30
-10
lines changed

2 files changed

+30
-10
lines changed

module/move/willbe/src/action/list.rs

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -462,17 +462,32 @@ mod private
462462
.package_find_by_manifest( manifest_file )
463463
.ok_or_else( || format_err!( "Package not found in the workspace" ) )
464464
.err_with_report( report )?;
465+
let version = if args.info.contains( &PackageAdditionalInfo::Version )
466+
{
467+
Some( package.version().to_string() )
468+
}
469+
else
470+
{
471+
None
472+
};
473+
let crate_dir = if args.info.contains( &PackageAdditionalInfo::Path )
474+
{
475+
Some( package.crate_dir() ).transpose()
476+
}
477+
else
478+
{
479+
Ok( None )
480+
}
481+
.err_with_report( report )?;
465482
let mut package_report = tool::ListNodeReport
466483
{
467484
name : package.name().to_string(),
468-
// qqq : for Bohdan : too long lines
469-
version : if args.info.contains( &PackageAdditionalInfo::Version ) { Some( package.version().to_string() ) } else { None },
470-
// qqq : for Bohdan : don't put multiline if into struct constructor
471-
crate_dir : if args.info.contains( &PackageAdditionalInfo::Path )
472-
{ Some( package.crate_dir() ).transpose() }
473-
else
474-
{ Ok( None ) }
475-
.err_with_report( report )?,
485+
// aaa : for Bohdan : too long lines
486+
// aaa : moved out
487+
version,
488+
// aaa : for Bohdan : don't put multiline if into struct constructor
489+
// aaa : moved out
490+
crate_dir,
476491
duplicate : false,
477492
normal_dependencies : vec![],
478493
dev_dependencies : vec![],

module/move/willbe/src/entity/dependency.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,13 @@ mod private
260260
}
261261
DependenciesSort::Topological =>
262262
{
263-
// qqq : too long line
264-
graph::toposort( graph::construct( &graph ) ).map_err( | err | format_err!( "{}", err ) )?.into_iter().filter( | x | x != &root ).collect()
263+
// aaa : too long line
264+
// aaa : splited
265+
graph::toposort( graph::construct( &graph ) )
266+
.map_err( | err | format_err!( "{}", err ) )?
267+
.into_iter()
268+
.filter( | x | x != &root )
269+
.collect()
265270
},
266271
};
267272

0 commit comments

Comments
 (0)