From 5deddb01dd6f8f8b1bbc1d3c40894718223bd67c Mon Sep 17 00:00:00 2001 From: SupperZum Date: Wed, 25 Jun 2025 16:31:45 +0300 Subject: [PATCH] rollback to 0.20 --- Cargo.toml | 2 +- module/move/willbe/Cargo.toml | 2 +- module/move/willbe/src/action/cicd_renew.rs | 2 +- module/move/willbe/src/action/crate_doc.rs | 20 ++--- module/move/willbe/src/action/list.rs | 4 +- module/move/willbe/src/action/publish.rs | 6 -- module/move/willbe/src/action/publish_diff.rs | 3 +- module/move/willbe/src/command/mod.rs | 15 ---- module/move/willbe/src/command/publish.rs | 12 +-- .../move/willbe/src/command/publish_diff.rs | 13 +-- module/move/willbe/src/entity/diff.rs | 34 +------ .../move/willbe/src/entity/files/crate_dir.rs | 2 +- .../willbe/src/entity/files/manifest_file.rs | 4 +- module/move/willbe/src/entity/package.rs | 4 +- module/move/willbe/src/entity/publish.rs | 89 +++++++------------ module/move/willbe/src/tool/graph.rs | 3 +- module/move/willbe/tests/inc/entity/diff.rs | 4 +- module/move/willbe/tests/inc/package.rs | 2 - 18 files changed, 60 insertions(+), 161 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 911dfcaed0..dd7995daf8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -478,7 +478,7 @@ path = "module/move/wcensor" ## willbe [workspace.dependencies.willbe] -version = "~0.21.0" +version = "~0.20.0" path = "module/move/willbe" diff --git a/module/move/willbe/Cargo.toml b/module/move/willbe/Cargo.toml index ebd0c226d2..8086d5372b 100644 --- a/module/move/willbe/Cargo.toml +++ b/module/move/willbe/Cargo.toml @@ -1,7 +1,7 @@ # module/move/willbe/Cargo.toml [package] name = "willbe" -version = "0.21.0" +version = "0.20.0" edition = "2021" authors = [ "Kostiantyn Wandalen ", diff --git a/module/move/willbe/src/action/cicd_renew.rs b/module/move/willbe/src/action/cicd_renew.rs index cec1aae1c8..e5866f1e0a 100644 --- a/module/move/willbe/src/action/cicd_renew.rs +++ b/module/move/willbe/src/action/cicd_renew.rs @@ -144,7 +144,7 @@ mod private let content = handlebars.render( "module_push", &data )?; file_write( &workflow_file_name, &content )?; - println!( "file_write : {:?}", &workflow_file_name ); + println!( "file_write : {}", &workflow_file_name.display() ); } dbg!( &workflow_root ); diff --git a/module/move/willbe/src/action/crate_doc.rs b/module/move/willbe/src/action/crate_doc.rs index 91f48874a1..864ed984d4 100644 --- a/module/move/willbe/src/action/crate_doc.rs +++ b/module/move/willbe/src/action/crate_doc.rs @@ -104,7 +104,7 @@ mod private /// /// # Errors /// Returns an error if the command arguments are invalid, the workspace cannot be loaded - #[allow(clippy::too_many_lines)] + #[ allow( clippy::too_many_lines, clippy::result_large_err ) ] pub fn doc ( workspace : &Workspace, @@ -123,17 +123,17 @@ mod private // --- Get crate name early for --package argument and file naming --- let manifest_path_for_name = crate_dir.as_ref().join( "Cargo.toml" ); let manifest_content_for_name = fs::read_to_string( &manifest_path_for_name ) - .map_err( CrateDocError::Io ) - .context( format!( "Failed to read Cargo.toml at {}", manifest_path_for_name.display() ) ) - .err_with_report( &report )?; + .map_err( CrateDocError::Io ) + .context( format!( "Failed to read Cargo.toml at {}", manifest_path_for_name.display() ) ) + .err_with_report( &report )?; let manifest_toml_for_name = manifest_content_for_name.parse::< Document >() - .map_err( CrateDocError::Toml ) - .context( format!( "Failed to parse Cargo.toml at {}", manifest_path_for_name.display() ) ) - .err_with_report( &report )?; + .map_err( CrateDocError::Toml ) + .context( format!( "Failed to parse Cargo.toml at {}", manifest_path_for_name.display() ) ) + .err_with_report( &report )?; let crate_name = manifest_toml_for_name[ "package" ][ "name" ] - .as_str() - .ok_or_else( || CrateDocError::MissingPackageName( manifest_path_for_name.clone() ) ) - .err_with_report( &report )?; + .as_str() + .ok_or_else( || CrateDocError::MissingPackageName( manifest_path_for_name.clone() ) ) + .err_with_report( &report )?; // --- End get crate name early --- // Define the arguments for `cargo doc` diff --git a/module/move/willbe/src/action/list.rs b/module/move/willbe/src/action/list.rs index baa74feed0..3ed25a206d 100644 --- a/module/move/willbe/src/action/list.rs +++ b/module/move/willbe/src/action/list.rs @@ -324,10 +324,10 @@ mod private } #[ allow( clippy::trivially_copy_pass_by_ref, clippy::needless_lifetimes ) ] - fn process_package_dependency< 'a > + fn process_package_dependency ( workspace : &Workspace, - package : &WorkspacePackageRef< 'a >, + package : &WorkspacePackageRef< '_ >, args : &ListOptions, dep_rep : &mut tool::ListNodeReport, visited : &mut collection::HashSet< DependencyId > diff --git a/module/move/willbe/src/action/publish.rs b/module/move/willbe/src/action/publish.rs index c926c43063..99d9dd4223 100644 --- a/module/move/willbe/src/action/publish.rs +++ b/module/move/willbe/src/action/publish.rs @@ -110,7 +110,6 @@ mod private /// /// # Arguments /// * `patterns` - A vector of patterns specifying the folders to search for packages. - /// * `exclude_dev_dependencies` - A boolean value indicating whether to exclude dev dependencies from manifest before publish. /// * `dry` - A boolean value indicating whether to perform a dry run. /// * `temp` - A boolean value indicating whether to use a temporary directory. /// @@ -121,8 +120,6 @@ mod private ( patterns : Vec< String >, channel : channel::Channel, - exclude_dev_dependencies : bool, - commit_changes : bool, dry : bool, temp : bool ) @@ -219,7 +216,6 @@ mod private &tmp, &packages_to_publish, dir.clone(), - exclude_dev_dependencies )?; let subgraph = subgraph .map( | _, n | n, | _, e | e ); @@ -239,8 +235,6 @@ mod private .channel( channel ) .workspace_dir( CrateDir::try_from( workspace_root_dir ).unwrap() ) .option_base_temp_dir( dir.clone() ) - .exclude_dev_dependencies( exclude_dev_dependencies ) - .commit_changes( commit_changes ) .dry( dry ) .roots( roots ) .packages( queue ) diff --git a/module/move/willbe/src/action/publish_diff.rs b/module/move/willbe/src/action/publish_diff.rs index f170053773..c204ac5bce 100644 --- a/module/move/willbe/src/action/publish_diff.rs +++ b/module/move/willbe/src/action/publish_diff.rs @@ -22,7 +22,6 @@ mod private pub struct PublishDiffOptions { path : PathBuf, - exclude_dev_dependencies : bool, keep_archive : Option< PathBuf >, } @@ -169,7 +168,7 @@ mod private std::fs::write( local_path, content )?; } } - diffs.insert( path, crate_diff( &l, &r, o.exclude_dev_dependencies ).exclude( diff::PUBLISH_IGNORE_LIST ) ); + diffs.insert( path, crate_diff( &l, &r ).exclude( diff::PUBLISH_IGNORE_LIST ) ); let report = tasks[ current_idx ].info.normal_dependencies.clone(); let printer : Vec< TreePrinter > = report .iter() diff --git a/module/move/willbe/src/command/mod.rs b/module/move/willbe/src/command/mod.rs index 8423756275..bf215440aa 100644 --- a/module/move/willbe/src/command/mod.rs +++ b/module/move/willbe/src/command/mod.rs @@ -27,16 +27,6 @@ mod private .kind( Type::String ) .optional( true ) .end() - .property( "exclude_dev_dependencies" ) - .hint( "Setting this option to true will temporarily remove development dependencies before executing the command, then restore them afterward. Default is `true`." ) - .kind( Type::Bool ) - .optional( true ) - .end() - .property( "commit_changes" ) - .hint( "Indicates whether changes should be committed. Default is `false`." ) - .kind( Type::Bool ) - .optional( true ) - .end() .property( "dry" ) .hint( "Enables 'dry run'. Does not publish, only simulates. Default is `true`." ) .kind( Type::Bool ) @@ -59,11 +49,6 @@ mod private .kind( Type::Path ) .optional( true ) .end() - .property( "exclude_dev_dependencies" ) - .hint( "Setting this option to true will temporarily remove development dependencies before executing the command, then restore them afterward. Default is `true`." ) - .kind( Type::Bool ) - .optional( true ) - .end() .property( "keep_archive" ) .hint( "Save remote package version to the specified path" ) .kind( Type::Path ) diff --git a/module/move/willbe/src/command/publish.rs b/module/move/willbe/src/command/publish.rs index 17622a61a1..004bb3dec8 100644 --- a/module/move/willbe/src/command/publish.rs +++ b/module/move/willbe/src/command/publish.rs @@ -17,10 +17,6 @@ mod private { #[ former( default = Channel::Stable ) ] channel : Channel, - #[ former( default = false ) ] - exclude_dev_dependencies : bool, - #[ former( default = false ) ] - commit_changes : bool, #[ former( default = true ) ] dry : bool, #[ former( default = true ) ] @@ -56,12 +52,10 @@ mod private let PublishProperties { channel, - exclude_dev_dependencies, - commit_changes, dry, temp } = o.props.try_into()?; - let plan = action::publish_plan( patterns, channel, exclude_dev_dependencies, commit_changes, dry, temp ) + let plan = action::publish_plan( patterns, channel, dry, temp ) .context( "Failed to plan the publication process" )?; let mut formatted_plan = String::new(); @@ -116,10 +110,6 @@ mod private else { this }; - this = if let Some( v ) = value - .get_owned( "exclude_dev_dependencies" ) { this.exclude_dev_dependencies::< bool >( v ) } else { this }; - this = if let Some( v ) = value - .get_owned( "commit_changes" ) { this.commit_changes::< bool >( v ) } else { this }; this = if let Some( v ) = value .get_owned( "dry" ) { this.dry::< bool >( v ) } else { this }; this = if let Some( v ) = value diff --git a/module/move/willbe/src/command/publish_diff.rs b/module/move/willbe/src/command/publish_diff.rs index 240dc1e7f8..babfa4a629 100644 --- a/module/move/willbe/src/command/publish_diff.rs +++ b/module/move/willbe/src/command/publish_diff.rs @@ -14,8 +14,6 @@ mod private #[ derive( former::Former ) ] struct PublishDiffProperties { - #[ former( default = false ) ] - exclude_dev_dependencies : bool, keep_archive : Option< PathBuf >, } @@ -38,11 +36,10 @@ mod private pub fn publish_diff( o : VerifiedCommand ) -> error::untyped::Result< () > // qqq : use typed error { let path : PathBuf = o.args.get_owned( 0 ).unwrap_or( std::env::current_dir()? ); - let PublishDiffProperties { keep_archive, exclude_dev_dependencies } = o.props.try_into()?; + let PublishDiffProperties { keep_archive } = o.props.try_into()?; let mut o = action::PublishDiffOptions::former() - .path( path ) - .exclude_dev_dependencies( exclude_dev_dependencies ); + .path( path ); if let Some( k ) = keep_archive.clone() { o = o.keep_archive( k ); } let o = o.form(); @@ -64,12 +61,6 @@ mod private { let mut this = Self::former(); - this = if let Some( v ) = value - .get_owned( "exclude_dev_dependencies" ) - { this.exclude_dev_dependencies::< bool >( v ) } - else - { this }; - this = if let Some( v ) = value .get_owned( "keep_archive" ) { this.keep_archive::< PathBuf >( v ) } diff --git a/module/move/willbe/src/entity/diff.rs b/module/move/willbe/src/entity/diff.rs index 99f7f2e1af..58438896f4 100644 --- a/module/move/willbe/src/entity/diff.rs +++ b/module/move/willbe/src/entity/diff.rs @@ -162,7 +162,7 @@ mod private /// # Panics /// qqq: doc #[ must_use ] - pub fn crate_diff( left : &CrateArchive, right : &CrateArchive, exclude_dev_dependencies : bool ) -> DiffReport + pub fn crate_diff( left : &CrateArchive, right : &CrateArchive ) -> DiffReport { let mut report = DiffReport::default(); @@ -189,38 +189,10 @@ mod private { // unwraps are safe because the paths to the files was compared previously - let mut local = left.content_bytes( path ).unwrap(); - let mut remote = right.content_bytes( path ).unwrap(); + let local = left.content_bytes( path ).unwrap(); + let remote = right.content_bytes( path ).unwrap(); - let ( l, r ) = if path.ends_with( "Cargo.toml.orig" ) && exclude_dev_dependencies - { - - let local = std::str::from_utf8( left.content_bytes( path ).unwrap() ).unwrap(); - let mut local_data = local.parse::< toml_edit::Document >().unwrap(); - local_data.remove( "dev-dependencies" ); - let local = local_data.to_string().as_bytes().to_vec(); - - - let remote = std::str::from_utf8( right.content_bytes( path ).unwrap() ).unwrap(); - let mut remote_data = remote.parse::< toml_edit::Document >().unwrap(); - remote_data.remove( "dev-dependencies" ); - let remote = remote_data.to_string().as_bytes().to_vec(); - - ( local, remote ) - } - else - { - ( vec![], vec![] ) - }; - - - if !l.is_empty() && !r.is_empty() - { - local = l.as_slice(); - remote = r.as_slice(); - } - if local == remote { report.0.insert( path.to_path_buf(), DiffItem::File( Diff::Same( () ) ) ); diff --git a/module/move/willbe/src/entity/files/crate_dir.rs b/module/move/willbe/src/entity/files/crate_dir.rs index eab1ed5a1d..2ac4340956 100644 --- a/module/move/willbe/src/entity/files/crate_dir.rs +++ b/module/move/willbe/src/entity/files/crate_dir.rs @@ -147,7 +147,7 @@ impl TryFrom< AbsolutePath > for CrateDir { if !crate_dir_path.as_ref().join( "Cargo.toml" ).is_file() { - let err = io::Error::new( io::ErrorKind::InvalidData, format!( "Cannot find crate dir at {crate_dir_path:?}" ) ); + let err = io::Error::new( io::ErrorKind::InvalidData, format!( "Cannot find crate dir at {}", crate_dir_path.display() ) ); return Err( PathError::Io( err ) ); } Ok( Self( crate_dir_path ) ) diff --git a/module/move/willbe/src/entity/files/manifest_file.rs b/module/move/willbe/src/entity/files/manifest_file.rs index cb6286647c..ee17d3352b 100644 --- a/module/move/willbe/src/entity/files/manifest_file.rs +++ b/module/move/willbe/src/entity/files/manifest_file.rs @@ -157,13 +157,13 @@ impl TryFrom< AbsolutePath > for ManifestFile if !manifest_file.as_ref().ends_with( "Cargo.toml" ) { - let err = io::Error::new( io::ErrorKind::Other, format!( "File path does not end with Cargo.toml as it should {manifest_file:?}" ) ); + let err = io::Error::other( format!( "File path does not end with Cargo.toml as it should {}", manifest_file.display() ) ); return Err( PathError::Io( err ) ); } if !manifest_file.as_ref().is_file() { - let err = io::Error::new( io::ErrorKind::InvalidData, format!( "Cannot find crate dir at {manifest_file:?}" ) ); + let err = io::Error::new( io::ErrorKind::InvalidData, format!( "Cannot find crate dir at {}", manifest_file.display() ) ); return Err( PathError::Io( err ) ); } Ok( Self( manifest_file ) ) diff --git a/module/move/willbe/src/entity/package.rs b/module/move/willbe/src/entity/package.rs index dc8965e209..b5de716391 100644 --- a/module/move/willbe/src/entity/package.rs +++ b/module/move/willbe/src/entity/package.rs @@ -219,7 +219,7 @@ mod private /// Panics if the package is not loaded or local package is not packed. /// # Errors /// qqq: doc - pub fn publish_need( package : &Package< '_ >, path : Option< path::PathBuf >, exclude_dev_dependencies : bool ) -> Result< bool, PackageError > + pub fn publish_need( package : &Package< '_ >, path : Option< path::PathBuf > ) -> Result< bool, PackageError > { let name = package.name()?; let version = package.version()?; @@ -236,7 +236,7 @@ mod private _ => return Err( PackageError::LoadRemotePackage ), }; - Ok( diff::crate_diff( &local_package, &remote_package, exclude_dev_dependencies ).exclude( diff::PUBLISH_IGNORE_LIST ).has_changes() ) + Ok( diff::crate_diff( &local_package, &remote_package ).exclude( diff::PUBLISH_IGNORE_LIST ).has_changes() ) } } diff --git a/module/move/willbe/src/entity/publish.rs b/module/move/willbe/src/entity/publish.rs index f5e03c4fe7..a34d8e0195 100644 --- a/module/move/willbe/src/entity/publish.rs +++ b/module/move/willbe/src/entity/publish.rs @@ -28,7 +28,7 @@ mod private /// Options for bumping the package version. pub bump : version::BumpOptions, /// Git options related to the package. - pub git_options : Option< entity::git::GitOptions >, + pub git_options : entity::git::GitOptions, /// Options for publishing the package using Cargo. pub publish : cargo::PublishOptions, /// Indicates whether the process should be dry-run (no actual publishing). @@ -45,8 +45,6 @@ mod private channel : channel::Channel, base_temp_dir : Option< path::PathBuf >, #[ former( default = true ) ] - commit_changes : bool, - #[ former( default = true ) ] dry : bool, } @@ -77,16 +75,13 @@ mod private dependencies : dependencies.clone(), dry : self.dry, }; - let git_options = if self.commit_changes + let git_options = entity::git::GitOptions { - Some( entity::git::GitOptions - { - git_root : workspace_root, - items : dependencies.iter().chain( [ &crate_dir ] ).map( | d | d.clone().absolute_path().join( "Cargo.toml" ) ).collect(), - message : format!( "{}-v{}", self.package.name().unwrap(), new_version ), - dry : self.dry, - }) - } else { None }; + git_root : workspace_root, + items : dependencies.iter().chain( [ &crate_dir ] ).map( | d | d.clone().absolute_path().join( "Cargo.toml" ) ).collect(), + message : format!( "{}-v{}", self.package.name().unwrap(), new_version ), + dry : self.dry, + }; let publish = cargo::PublishOptions { path : crate_dir.clone().absolute_path().inner(), @@ -128,14 +123,6 @@ mod private /// Release channels for rust. pub channel : channel::Channel, - /// Setting this option to true will temporarily remove development dependencies before executing the command, then restore them afterward. - #[ allow( dead_code ) ] // former related - pub exclude_dev_dependencies : bool, - - /// Indicates whether changes should be committed. - #[ former( default = true ) ] - pub commit_changes : bool, - /// `dry` - A boolean value indicating whether to do a dry run. If set to `true`, the application performs /// a simulated run without making any actual changes. If set to `false`, the operations are actually executed. /// This property is optional and defaults to `true`. @@ -262,10 +249,6 @@ mod private { plan = plan.dry( dry ); } - if let Some( commit_changes ) = &self.storage.commit_changes - { - plan = plan.commit_changes( *commit_changes ); - } let plan = plan .channel( channel ) .package( package ) @@ -370,7 +353,7 @@ mod private /// /// # Errors /// qqq: doc - #[ allow( clippy::option_map_unit_fn ) ] + #[ allow( clippy::option_map_unit_fn, clippy::result_large_err ) ] pub fn perform_package_publish( instruction : PackagePublishInstruction ) -> ResultWithReport< PublishReport, Error > { let mut report = PublishReport::default(); @@ -385,7 +368,7 @@ mod private } = instruction; pack.dry = dry; bump.dry = dry; - git_options.as_mut().map( | d | d.dry = dry ); + git_options.dry = dry; publish.dry = dry; report.get_info = Some( cargo::pack( pack ).err_with_report( &report )? ); @@ -393,50 +376,38 @@ mod private let bump_report = version::bump( bump ).err_with_report( &report )?; report.bump = Some( bump_report.clone() ); - let git_root = git_options.as_ref().map( | g | g.git_root.clone() ); - if let Some( git_options ) = git_options + let git_root = git_options.git_root.clone(); + let git = match entity::git::perform_git_commit( git_options ) { - let git = match entity::git::perform_git_commit( git_options ) + Ok( git ) => git, + Err( e ) => { - Ok( git ) => git, - Err( e ) => - { - version::revert( &bump_report ) - .map_err( | le | format_err! - ( - "Base error:\n{}\nRevert error:\n{}", e.to_string().replace( '\n', "\n\t" ), le.to_string().replace( '\n', "\n\t" ) - )) - .err_with_report( &report )?; - return Err( ( report, e ) ); - } - }; - report.add = git.add; - report.commit = git.commit; - } + version::revert( &bump_report ) + .map_err( | le | format_err!( "Base error:\n{}\nRevert error:\n{}", e.to_string().replace( '\n', "\n\t" ), le.to_string().replace( '\n', "\n\t" ) ) ) + .err_with_report( &report )?; + return Err( ( report, e ) ); + } + }; + report.add = git.add; + report.commit = git.commit; report.publish = match cargo::publish( publish ) { Ok( publish ) => Some( publish ), Err( e ) => { - if let Some( git_root ) = git_root.as_ref() - { - tool::git::reset( git_root.as_ref(), true, 1, false ) - .map_err - ( - | le | - format_err!( "Base error:\n{}\nRevert error:\n{}", e.to_string().replace( '\n', "\n\t" ), le.to_string().replace( '\n', "\n\t" ) ) - ) - .err_with_report( &report )?; - } + tool::git::reset( git_root.as_ref(), true, 1, false ) + .map_err + ( + | le | + format_err!( "Base error:\n{}\nRevert error:\n{}", e.to_string().replace( '\n', "\n\t" ), le.to_string().replace( '\n', "\n\t" ) ) + ) + .err_with_report( &report )?; return Err( ( report, e ) ); } }; - if let Some( git_root ) = git_root.as_ref() - { - let res = tool::git::push( git_root, dry ).err_with_report( &report )?; - report.push = Some( res ); - } + let res = tool::git::push( &git_root, dry ).err_with_report( &report )?; + report.push = Some( res ); Ok( report ) } diff --git a/module/move/willbe/src/tool/graph.rs b/module/move/willbe/src/tool/graph.rs index 92a4f61ff1..e0ba9bc109 100644 --- a/module/move/willbe/src/tool/graph.rs +++ b/module/move/willbe/src/tool/graph.rs @@ -273,7 +273,6 @@ mod private graph : &Graph< String, String >, roots : &[ String ], temp_path : Option< PathBuf >, - exclude_dev_dependencies : bool, ) -> error::untyped::Result< Graph< String, String > > // qqq : use typed error! @@ -306,7 +305,7 @@ mod private .allow_dirty( true ) .form() )?; - if publish_need( package, temp_path.clone(), exclude_dev_dependencies ).unwrap() + if publish_need( package, temp_path.clone() ).unwrap() { nodes.insert( n ); } diff --git a/module/move/willbe/tests/inc/entity/diff.rs b/module/move/willbe/tests/inc/entity/diff.rs index ec8af5b6e6..9c84aa6cc1 100644 --- a/module/move/willbe/tests/inc/entity/diff.rs +++ b/module/move/willbe/tests/inc/entity/diff.rs @@ -24,7 +24,7 @@ fn no_changes() let right_crate = crate_file_path( &right ); let right_archive = CrateArchive::read( &right_crate ).unwrap(); - let has_changes = crate_diff( &left_archive, &right_archive, false ).exclude( diff::PUBLISH_IGNORE_LIST ).has_changes(); + let has_changes = crate_diff( &left_archive, &right_archive ).exclude( diff::PUBLISH_IGNORE_LIST ).has_changes(); assert!( !has_changes ); } @@ -65,7 +65,7 @@ fn with_changes() CrateArchive::read( &right_crate ).unwrap() }; - let has_changes = crate_diff( &left, &right, false ).exclude( diff::PUBLISH_IGNORE_LIST ).has_changes(); + let has_changes = crate_diff( &left, &right ).exclude( diff::PUBLISH_IGNORE_LIST ).has_changes(); assert!( has_changes ); } diff --git a/module/move/willbe/tests/inc/package.rs b/module/move/willbe/tests/inc/package.rs index c9b84d5a89..0a2a07dd05 100644 --- a/module/move/willbe/tests/inc/package.rs +++ b/module/move/willbe/tests/inc/package.rs @@ -260,8 +260,6 @@ fn kos_plan() channel::Channel::Stable, false, false, - true, - false, ) .unwrap();