Skip to content

Commit 3af12ed

Browse files
committed
fix(willbe): imports related to wca changes
1 parent 39907f7 commit 3af12ed

File tree

9 files changed

+17
-25
lines changed

9 files changed

+17
-25
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ mod private
7171
// -> Result< TestsReport, ( TestsReport, Error ) >
7272
{
7373

74-
// qqq : incapsulate progress bar logic into some function of struct. don't keep it here
74+
// aaa : incapsulate progress bar logic into some function of struct. don't keep it here
7575
// aaa : done
7676

7777
let mut report = TestsReport::default();
@@ -164,7 +164,7 @@ Try to install it with `rustup install {}` command(-s)",
164164
).err_with_report( &report )?;
165165

166166
println!( "{plan}" );
167-
// aaa : split on two functions for create plan and for execute
167+
// aaa : split on two functions for create plan and for execute
168168
// aaa : it's already separated, look line: 203 : let result = tests_run( &options );
169169

170170
let temp_path = if temp

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ mod private
9797
Ok( () )
9898
}
9999

100-
impl TryFrom< wca::Props > for ListProperties
100+
impl TryFrom< wca::executor::Props > for ListProperties
101101
{
102102
type Error = error::untyped::Error;
103-
fn try_from( value : wca::Props ) -> Result< Self, Self::Error >
103+
fn try_from( value : wca::executor::Props ) -> Result< Self, Self::Error >
104104
{
105105
let mut this = Self::former();
106106

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ mod private
101101
}
102102
}
103103

104-
impl TryFrom< wca::Props > for PublishProperties
104+
impl TryFrom< wca::executor::Props > for PublishProperties
105105
{
106106
type Error = error::untyped::Error;
107-
fn try_from( value : wca::Props ) -> Result< Self, Self::Error >
107+
fn try_from( value : wca::executor::Props ) -> Result< Self, Self::Error >
108108
{
109109
let mut this = Self::former();
110110

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ mod private
5353
Ok( () )
5454
}
5555

56-
impl TryFrom< wca::Props > for PublishDiffProperties
56+
impl TryFrom< wca::executor::Props > for PublishDiffProperties
5757
{
5858
type Error = error::untyped::Error;
59-
fn try_from( value : wca::Props ) -> Result< Self, Self::Error >
59+
fn try_from( value : wca::executor::Props ) -> Result< Self, Self::Error >
6060
{
6161
let mut this = Self::former();
6262

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@ Set at least one of them to true." );
147147
}
148148
}
149149

150-
impl TryFrom< wca::Props > for TestsProperties
150+
impl TryFrom< wca::executor::Props > for TestsProperties
151151
{
152152
type Error = error::untyped::Error;
153-
fn try_from( value : wca::Props ) -> Result< Self, Self::Error >
153+
fn try_from( value : wca::executor::Props ) -> Result< Self, Self::Error >
154154
{
155155
let mut this = Self::former();
156156

@@ -192,4 +192,4 @@ crate::mod_interface!
192192
{
193193
/// run tests in specified crate
194194
exposed use test;
195-
}
195+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ mod private
3333
.context( "Fail to create workspace" )
3434
}
3535

36-
impl TryFrom< wca::Props > for WorkspaceNewProperties
36+
impl TryFrom< wca::executor::Props > for WorkspaceNewProperties
3737
{
3838
type Error = error::untyped::Error;
3939

40-
fn try_from( value : wca::Props ) -> std::result::Result< Self, Self::Error >
40+
fn try_from( value : wca::executor::Props ) -> std::result::Result< Self, Self::Error >
4141
{
4242
let mut this = Self::former();
4343

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ mod private
3636
/// Represents the optimization setting for the test variant.
3737
optimization : optimization::Optimization,
3838
/// Contains additional features or characteristics of the test variant.
39-
features : collection::BTreeSet<String>,
39+
features : collection::BTreeSet< String >,
4040
}
4141

4242
impl fmt::Display for TestVariant
4343
{
44-
fn fmt( &self, f : &mut fmt::Formatter< '_ >) -> fmt::Result
44+
fn fmt( &self, f : &mut fmt::Formatter< '_ > ) -> fmt::Result
4545
{
4646
let features = if self.features.is_empty() { " ".to_string() } else { self.features.iter().join( " " ) };
4747
writeln!( f, "{} {} {}", self.optimization, self.channel, features )?;
@@ -58,7 +58,7 @@ mod private
5858

5959
impl fmt::Display for TestPlan
6060
{
61-
fn fmt( &self, f : &mut fmt::Formatter< '_ >) -> std::fmt::Result
61+
fn fmt( &self, f : &mut fmt::Formatter< '_ > ) -> std::fmt::Result
6262
{
6363
writeln!( f, "Plan: " )?;
6464
for plan in &self.packages_plan

module/move/willbe/src/tool/template.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ mod private
172172
impl TemplateParameters
173173
{
174174
/// Extracts template values from props for parameters required for this template.
175-
pub fn values_from_props( &self, props : &wca::Props ) -> TemplateValues
175+
pub fn values_from_props( &self, props : &wca::executor::Props ) -> TemplateValues
176176
{
177177
let values = self.descriptors
178178
.iter()

module/move/willbe/tests/inc/action_tests/test.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
use super::*;
2-
// use the_module::*;
32

43
// qqq : for Bohdan : bad. don't import the_module::*
54
use inc::helper::
65
{
76
ProjectBuilder,
87
WorkspaceBuilder,
9-
// BINARY_NAME,
108
};
119

1210
use collection::BTreeSet;
13-
// use std::
14-
// {
15-
// fs::{ self, File },
16-
// io::Write,
17-
// };
18-
// use path::{ Path, PathBuf };
1911
use assert_fs::TempDir;
2012

2113
use the_module::action::test::{ test, TestsCommandOptions };

0 commit comments

Comments
 (0)