Skip to content

Commit c1acb8f

Browse files
committed
fix willbe
1 parent 9f395e2 commit c1acb8f

19 files changed

+67
-65
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ mod private
4242

4343
// qqq : for Petro : should return Report and typed error in Result
4444
/// Generate workflows for modules in .github/workflows directory.
45-
pub fn cicd_renew( base_path : &Path ) -> Result< (), CiCdGenerateError >
45+
pub fn action( base_path : &Path ) -> Result< (), CiCdGenerateError >
4646
{
4747
let workspace_cache = Workspace::try_from( CrateDir::try_from( base_path )? )?;
4848
let packages = workspace_cache.packages();
@@ -401,5 +401,5 @@ mod private
401401

402402
crate::mod_interface!
403403
{
404-
exposed use cicd_renew;
404+
own use action;
405405
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,4 @@ crate::mod_interface!
112112
orphan use FeaturesOptions;
113113
orphan use FeaturesReport;
114114
}
115+
// qqq : don't use orphan here

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ mod private
436436
/// - `Result<ListReport, (ListReport, Error)>` - A result containing the list report if successful,
437437
/// or a tuple containing the list report and error if not successful.
438438
#[ cfg_attr( feature = "tracing", tracing::instrument ) ]
439-
pub fn list( args : ListOptions )
439+
pub fn list_all( args : ListOptions )
440440
->
441441
ResultWithReport< ListReport, error::untyped::Error > // qqq : should be specific error
442442
// qqq : use typed error
@@ -849,5 +849,5 @@ crate::mod_interface!
849849
/// Contains output of a single node of the action.
850850
// own use ListNodeReport;
851851
/// List packages in workspace.
852-
orphan use list;
852+
orphan use list_all;
853853
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ mod private
193193
/// [![docs.rs](https://raster.shields.io/static/v1?label=docs&message=online&color=eee&logo=docsdotrs&logoColor=eee)](https://docs.rs/wtools)
194194
/// <!--{ generate.main_header.end }-->
195195
/// ```
196-
pub fn readme_header_renew( crate_dir : CrateDir )
196+
pub fn action( crate_dir : CrateDir )
197197
// -> Result< MainHeaderRenewReport, ( MainHeaderRenewReport, MainHeaderRenewError ) >
198198
-> ResultWithReport< MainHeaderRenewReport, MainHeaderRenewError >
199199
{
@@ -265,7 +265,7 @@ mod private
265265
crate::mod_interface!
266266
{
267267
/// Generate header.
268-
orphan use readme_header_renew;
268+
own use action;
269269
/// Report.
270270
orphan use MainHeaderRenewReport;
271271
/// Error.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ mod private
105105
let path = AbsolutePath::try_from( o.path )?;
106106
let dir = CrateDir::try_from( path.clone() )?;
107107

108-
let list = action::list
108+
let list = action::list_all
109109
(
110110
action::list::ListOptions::former()
111111
.path_to_manifest( dir )

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ mod private
134134
// qqq : for Petro : should return report
135135
// qqq : for Petro : should have typed error
136136
/// Creates workspace template
137-
pub fn workspace_renew
137+
pub fn action
138138
(
139139
path : &Path,
140140
mut template : WorkspaceTemplate,
@@ -172,6 +172,6 @@ mod private
172172

173173
crate::mod_interface!
174174
{
175-
exposed use workspace_renew;
175+
own use action;
176176
orphan use WorkspaceTemplate;
177177
}

module/move/willbe/src/command/cicd_renew.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ mod private
1010
// qqq : typed error
1111
pub fn cicd_renew() -> error::untyped::Result< () >
1212
{
13-
action::cicd_renew
13+
action::cicd_renew::action
1414
(
1515
&std::env::current_dir()?
1616
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ mod private
8080
.dependency_categories( categories )
8181
.form();
8282

83-
match action::list( o )
83+
match action::list_all( o )
8484
{
8585
Ok( report ) =>
8686
{

module/move/willbe/src/command/main_header.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
mod private
22
{
33
use crate::*;
4-
use action;
4+
// use action;
55
use error::untyped::{ Error };
66

77
/// Generates header to main Readme.md file.
88
// qqq : typed error
99
pub fn readme_header_renew() -> error::untyped::Result< () >
1010
{
11-
match action::readme_header_renew
11+
match crate::action::main_header::action
1212
(
1313
CrateDir::transitive_try_from::< AbsolutePath >( CurrentPath )?
1414
)

module/move/willbe/src/command/readme_headers_renew.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
mod private
22
{
33
use crate::*;
4-
use action;
4+
// use action;
55
// use error::{ err };
66
use std::fmt::{ Display, Formatter };
77

@@ -64,7 +64,6 @@ mod private
6464
}
6565
}
6666

67-
6867
/// Aggregates two commands: `generate_modules_headers` & `generate_main_header`
6968
pub fn readme_headers_renew() -> error::untyped::Result< () > // qqq : use typed error
7069
{
@@ -73,7 +72,7 @@ mod private
7372
let crate_dir = CrateDir::transitive_try_from::< AbsolutePath >( CurrentPath )?;
7473
let mut fail = false;
7574

76-
match action::readme_header_renew( crate_dir.clone() )
75+
match crate::action::main_header::action( crate_dir.clone() )
7776
{
7877
Ok( r ) =>
7978
{

0 commit comments

Comments
 (0)