Skip to content

Commit 48c5a20

Browse files
committed
Merge branch 'wip5' into component_model_1
2 parents 87d13e3 + 0eb5a3d commit 48c5a20

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1704
-4525
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
/.vscode
1414
/_*
1515

16+
.roo
1617
.env
1718
_key
1819
_data

Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ members = [
1111
exclude = [
1212
"-*",
1313
"module/move/_video_experiment",
14+
"module/move/cargo_will",
1415
]
1516
# default-members = [ "module/core/wtools" ]
1617

@@ -56,6 +57,7 @@ single_call_fn = "allow"
5657
inline_always = "allow"
5758
module_name_repetitions = "allow"
5859
absolute_paths = "allow"
60+
wildcard_imports = "allow"
5961

6062
## top level
6163

@@ -460,14 +462,12 @@ default-features = false
460462
# path = "module/alias/wautomata"
461463
# default-features = false
462464

463-
464465
## ca
465466

466467
[workspace.dependencies.wca]
467468
version = "~0.24.0"
468469
path = "module/move/wca"
469470

470-
471471
## censor
472472

473473
[workspace.dependencies.wcensor]
@@ -649,7 +649,6 @@ default-features = false
649649
[workspace.dependencies.const_format]
650650
version = "~0.2.32"
651651
default-features = false
652-
653652
# proc-macro2 = { version = "~1.0.78", default-features = false, features = [] }
654653
# quote = { version = "~1.0.35", default-features = false, features = [] }
655654
# syn = { version = "~2.0.52", default-features = false, features = [ "full", "extra-traits" ] } # qqq : xxx : optimize set of features

module/alias/cargo_will/Cargo.toml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@ enabled = []
3333

3434
[dependencies]
3535
willbe = { workspace = true }
36+
error_tools = { workspace = true }
3637

37-
[dev-dependencies]
38-
test_tools = { workspace = true }
39-
assert_fs = "1.0"
40-
serde_yaml = "0.9"
41-
serde_json = "1.0.114"
42-
serde = "1.0"
43-
assert_cmd = "2.0"
44-
petgraph = "~0.6"
45-
cargo_metadata = "~0.14"
38+
# [dev-dependencies]
39+
# test_tools = { workspace = true }
40+
# assert_fs = "1.0"
41+
# serde_yaml = "0.9"
42+
# serde_json = "1.0.114"
43+
# serde = "1.0"
44+
# assert_cmd = "2.0"
45+
# petgraph = "~0.6"
46+
# cargo_metadata = "~0.14"

module/alias/cargo_will/plan.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Project Plan: Fix cargo_will crate
2+
3+
## Increments
4+
5+
* ❌ Increment 1: Analyze the structure and dependencies of the cargo_will crate.
6+
* Detailed Plan Step 1: Read the `Cargo.toml` file of the `cargo_will` crate to understand its dependencies.
7+
* Detailed Plan Step 2: List the files in the `src` directory of the `cargo_will` crate to understand its structure.
8+
* Detailed Plan Step 3: Read the main source file (e.g., `src/lib.rs` or `src/main.rs`) to understand the crate's entry point and overall logic.
9+
* Verification Strategy: Ensure the commands execute successfully and the output is as expected. Manually review the output to understand the structure and dependencies.
10+
* ⏳ Increment 2: Identify and fix any compilation errors in the cargo_will crate.
11+
* Detailed Plan Step 1: Run `cargo build` in the `module/alias/cargo_will` directory.
12+
* Detailed Plan Step 2: Analyze the output of `cargo build` to identify any compilation errors.
13+
* Detailed Plan Step 3: Fix any identified compilation errors.
14+
* Verification Strategy: Ensure `cargo build` executes successfully with no errors.
15+
16+
## Notes & Insights
17+
* **[5/3/2025] Stuck:** Encountered persistent issues with building the crate due to dependency resolution problems. Initiating Stuck Resolution Process.
18+
19+
## Hypotheses
20+
21+
* Hypothesis 1: The path to the `willbe` dependency is incorrect.
22+
* Hypothesis 2: There is a version conflict between the `error_tools` dependency in `cargo_will` and `willbe`.
23+
* Hypothesis 3: There is an issue with the workspace configuration in the root `Cargo.toml` file.

module/core/clone_dyn_meta/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ mod derive;
1313
1414
#[ cfg( feature = "enabled" ) ]
1515
#[ proc_macro_attribute ]
16-
pub fn clone_dyn( _attr : proc_macro::TokenStream, item : proc_macro::TokenStream ) -> proc_macro::TokenStream
16+
pub fn clone_dyn( attr : proc_macro::TokenStream, item : proc_macro::TokenStream ) -> proc_macro::TokenStream
1717
{
18-
let result = derive::clone_dyn( _attr, item );
18+
let result = derive::clone_dyn( attr, item );
1919
match result
2020
{
2121
Ok( stream ) => stream.into(),

module/core/derive_tools_meta/src/derive/new.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ fn variant_generate
320320
return Ok( qt!{} )
321321
}
322322

323-
if fields.len() <= 0
323+
if fields.len() == 0
324324
{
325325
return Ok( qt!{} )
326326
}

module/core/derive_tools_meta/src/lib.rs

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -614,9 +614,9 @@ pub fn derive_not( input : proc_macro::TokenStream ) -> proc_macro::TokenStream
614614
#[ cfg( feature = "enabled" ) ]
615615
#[ cfg ( feature = "derive_phantom" ) ]
616616
#[ proc_macro_attribute ]
617-
pub fn phantom( _attr: proc_macro::TokenStream, input : proc_macro::TokenStream ) -> proc_macro::TokenStream
617+
pub fn phantom( attr: proc_macro::TokenStream, input : proc_macro::TokenStream ) -> proc_macro::TokenStream
618618
{
619-
let result = derive::phantom::phantom( _attr, input );
619+
let result = derive::phantom::phantom( attr, input );
620620
match result
621621
{
622622
Ok( stream ) => stream.into(),
@@ -641,12 +641,12 @@ pub fn phantom( _attr: proc_macro::TokenStream, input : proc_macro::TokenStream
641641
/// a : Vec< T >,
642642
/// }
643643
///
644-
/// impl< T > Index< usize > for IsTransparent< T >
644+
/// impl< T > Index< usize > for IsTransparent< T >
645645
/// {
646646
/// type Output = T;
647647
///
648648
/// #[ inline( always ) ]
649-
/// fn index( &self, index : usize ) -> &Self::Output
649+
/// fn index( &self, index : usize ) -> &Self::Output
650650
/// {
651651
/// &self.a[ index ]
652652
/// }
@@ -657,25 +657,25 @@ pub fn phantom( _attr: proc_macro::TokenStream, input : proc_macro::TokenStream
657657
///
658658
/// ```rust
659659
/// use derive_tools_meta::*;
660-
///
660+
///
661661
/// #[ derive( Index ) ]
662-
/// pub struct IsTransparent< T >
662+
/// pub struct IsTransparent< T >
663663
/// {
664664
/// #[ index ]
665-
/// a : Vec< T >
665+
/// a : Vec< T >
666666
/// };
667667
/// ```
668668
///
669669
#[ cfg( feature = "enabled" ) ]
670670
#[ cfg( feature = "derive_index" ) ]
671671
#[ proc_macro_derive
672-
(
673-
Index,
672+
(
673+
Index,
674674
attributes
675-
(
676-
debug, // item
675+
(
676+
debug, // item
677677
index, // field
678-
)
678+
)
679679
)]
680680
pub fn derive_index( input : proc_macro::TokenStream ) -> proc_macro::TokenStream
681681
{
@@ -703,20 +703,20 @@ pub fn derive_index( input : proc_macro::TokenStream ) -> proc_macro::TokenStrea
703703
/// a : Vec< T >,
704704
/// }
705705
///
706-
/// impl< T > Index< usize > for IsTransparent< T >
706+
/// impl< T > Index< usize > for IsTransparent< T >
707707
/// {
708708
/// type Output = T;
709709
///
710710
/// #[ inline( always ) ]
711-
/// fn index( &self, index : usize ) -> &Self::Output
711+
/// fn index( &self, index : usize ) -> &Self::Output
712712
/// {
713713
/// &self.a[ index ]
714714
/// }
715715
/// }
716716
///
717717
/// impl< T > IndexMut< usize > for IsTransparent< T >
718718
/// {
719-
/// fn index_mut( &mut self, index : usize ) -> &mut Self::Output
719+
/// fn index_mut( &mut self, index : usize ) -> &mut Self::Output
720720
/// {
721721
/// &mut self.a[ index ]
722722
/// }
@@ -728,23 +728,23 @@ pub fn derive_index( input : proc_macro::TokenStream ) -> proc_macro::TokenStrea
728728
/// ```rust
729729
/// use derive_tools_meta::*;
730730
/// #[derive( IndexMut )]
731-
/// pub struct IsTransparent< T >
732-
/// {
731+
/// pub struct IsTransparent< T >
732+
/// {
733733
/// #[ index ]
734-
/// a : Vec< T >
734+
/// a : Vec< T >
735735
/// };
736736
/// ```
737737
///
738738
#[ cfg( feature = "enabled" ) ]
739739
#[ cfg( feature = "derive_index_mut" ) ]
740740
#[ proc_macro_derive
741-
(
742-
IndexMut,
741+
(
742+
IndexMut,
743743
attributes
744-
(
745-
debug, // item
744+
(
745+
debug, // item
746746
index, // field
747-
)
747+
)
748748
)]
749749
pub fn derive_index_mut( input : proc_macro::TokenStream ) -> proc_macro::TokenStream
750750
{

module/core/former/Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ Where `former` significantly simplifies complex scenarios is in building collect
197197
For scenarios where you want a direct constructor function instead of always starting with `YourType::former()`, `former` offers standalone constructors.
198198

199199
* **Enable:** Add `#[ standalone_constructors ]` to your struct or enum definition.
200-
* **Function Name:** A function named after your type (in snake_case) will be generated (e.g., `my_struct()` for `struct MyStruct`). For enums, functions are named after variants (e.g., `my_variant()` for `enum E { MyVariant }`).
200+
* **Function Name:** A function named after your type (in `snake_case`) will be generated (e.g., `my_struct()` for `struct MyStruct`). For enums, functions are named after variants (e.g., `my_variant()` for `enum E { MyVariant }`).
201201
* **Arguments:** By default, the constructor takes no arguments and returns the `Former` type.
202202
* **Specify Arguments:** Mark specific fields with `#[ arg_for_constructor ]` to make them required arguments for the standalone constructor.
203203
* **Return Type (Option 2 Logic):**

0 commit comments

Comments
 (0)