Skip to content

Commit 7f2f384

Browse files
committed
Merge branch 'unilang_4' into alpha
# Conflicts: # Makefile
2 parents d1a9239 + f90e46e commit 7f2f384

File tree

189 files changed

+982
-328
lines changed

Some content is hidden

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

189 files changed

+982
-328
lines changed

Cargo.toml

Lines changed: 45 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ exclude = [
3131
"module/alias/wtest",
3232
"module/core/meta_tools",
3333
"module/core/for_each",
34-
"module/core/reflect_tools",
35-
"module/core/format_tools",
3634
"step",
3735
]
3836
# default-members = [ "module/core/wtools" ]
@@ -124,14 +122,14 @@ version = "~0.1.4"
124122
path = "module/alias/std_x"
125123

126124
[workspace.dependencies.unilang_parser]
127-
version = "~0.10.0"
125+
version = "~0.11.0"
128126
path = "module/move/unilang_parser" # Point to original unilang_parser
129127

130128

131129
## data_type
132130

133131
[workspace.dependencies.data_type]
134-
version = "~0.14.0"
132+
version = "~0.15.0"
135133
path = "module/core/data_type"
136134
default-features = false
137135

@@ -149,7 +147,7 @@ version = "~0.1.0"
149147
path = "module/core/type_constructor_derive_pair_meta"
150148

151149
[workspace.dependencies.interval_adapter]
152-
version = "~0.35.0"
150+
version = "~0.36.0"
153151
path = "module/core/interval_adapter"
154152
default-features = false
155153
# features = [ "enabled" ]
@@ -161,39 +159,39 @@ default-features = false
161159
# features = [ "enabled" ]
162160

163161
[workspace.dependencies.collection_tools]
164-
version = "~0.23.0"
162+
version = "~0.25.0"
165163
path = "module/core/collection_tools"
166164
default-features = false
167165

168166

169167
## derive
170168

171169
[workspace.dependencies.derive_tools]
172-
version = "~0.45.0"
170+
version = "~0.47.0"
173171
path = "module/core/derive_tools"
174172
default-features = false
175173
# features = [ "enabled" ]
176174

177175
[workspace.dependencies.derive_tools_meta]
178-
version = "~0.44.0"
176+
version = "~0.46.0"
179177
path = "module/core/derive_tools_meta"
180178
default-features = false
181179
# features = [ "enabled" ]
182180

183181
[workspace.dependencies.reflect_tools]
184-
version = "~0.6.0"
182+
version = "~0.7.0"
185183
path = "module/core/reflect_tools"
186184
default-features = false
187185
# features = [ "enabled" ]
188186

189187
[workspace.dependencies.reflect_tools_meta]
190-
version = "~0.6.0"
188+
version = "~0.7.0"
191189
path = "module/core/reflect_tools_meta"
192190
default-features = false
193191
# features = [ "enabled" ]
194192

195193
[workspace.dependencies.format_tools]
196-
version = "~0.5.0"
194+
version = "~0.6.0"
197195
path = "module/core/format_tools"
198196
default-features = false
199197
# features = [ "enabled" ]
@@ -217,30 +215,30 @@ path = "module/alias/fundamental_data_type"
217215
default-features = false
218216

219217
[workspace.dependencies.variadic_from]
220-
version = "~0.39.0"
218+
version = "~0.41.0"
221219
path = "module/core/variadic_from"
222220
default-features = false
223221
# features = [ "enabled" ]
224222

225223
[workspace.dependencies.variadic_from_meta]
226-
version = "~0.10.0"
224+
version = "~0.12.0"
227225
path = "module/core/variadic_from_meta"
228226
default-features = false
229227
# features = [ "enabled" ]
230228

231229
[workspace.dependencies.clone_dyn]
232-
version = "~0.42.0"
230+
version = "~0.44.0"
233231
path = "module/core/clone_dyn"
234232
default-features = false
235233
# features = [ "enabled" ]
236234

237235
[workspace.dependencies.clone_dyn_meta]
238-
version = "~0.39.0"
236+
version = "~0.41.0"
239237
path = "module/core/clone_dyn_meta"
240238
# features = [ "enabled" ]
241239

242240
[workspace.dependencies.clone_dyn_types]
243-
version = "~0.37.0"
241+
version = "~0.38.0"
244242
path = "module/core/clone_dyn_types"
245243
default-features = false
246244
# features = [ "enabled" ]
@@ -265,7 +263,7 @@ default-features = false
265263
## iter
266264

267265
[workspace.dependencies.iter_tools]
268-
version = "~0.36.0"
266+
version = "~0.37.0"
269267
path = "module/core/iter_tools"
270268
default-features = false
271269

@@ -283,32 +281,32 @@ path = "module/core/for_each"
283281
default-features = false
284282

285283
[workspace.dependencies.former]
286-
version = "~2.27.0"
284+
version = "~2.28.0"
287285
path = "module/core/former"
288286
default-features = false
289287

290288
[workspace.dependencies.former_meta]
291-
version = "~2.26.0"
289+
version = "~2.27.0"
292290
path = "module/core/former_meta"
293291
default-features = false
294292

295293
[workspace.dependencies.former_types]
296-
version = "~2.23.0"
294+
version = "~2.24.0"
297295
path = "module/core/former_types"
298296
default-features = false
299297

300298
[workspace.dependencies.component_model]
301-
version = "~0.5.0"
299+
version = "~0.6.0"
302300
path = "module/core/component_model"
303301
default-features = false
304302

305303
[workspace.dependencies.component_model_meta]
306-
version = "~0.5.0"
304+
version = "~0.6.0"
307305
path = "module/core/component_model_meta"
308306
default-features = false
309307

310308
[workspace.dependencies.component_model_types]
311-
version = "~0.9.0"
309+
version = "~0.11.0"
312310
path = "module/core/component_model_types"
313311
default-features = false
314312

@@ -322,12 +320,12 @@ version = "~0.13.0"
322320
path = "module/core/impls_index_meta"
323321

324322
[workspace.dependencies.mod_interface]
325-
version = "~0.43.0"
323+
version = "~0.44.0"
326324
path = "module/core/mod_interface"
327325
default-features = false
328326

329327
[workspace.dependencies.mod_interface_meta]
330-
version = "~0.41.0"
328+
version = "~0.42.0"
331329
path = "module/core/mod_interface_meta"
332330
default-features = false
333331

@@ -353,7 +351,7 @@ default-features = false
353351
## macro tools
354352

355353
[workspace.dependencies.macro_tools]
356-
version = "~0.65.0"
354+
version = "~0.67.0"
357355
path = "module/core/macro_tools"
358356
default-features = false
359357

@@ -412,7 +410,7 @@ default-features = false
412410
## error
413411

414412
[workspace.dependencies.error_tools]
415-
version = "~0.31.0"
413+
version = "~0.32.0"
416414
path = "module/core/error_tools"
417415
default-features = false
418416

@@ -424,12 +422,12 @@ path = "module/alias/werror"
424422
## string tools
425423

426424
[workspace.dependencies.strs_tools]
427-
version = "~0.28.0"
425+
version = "~0.29.0"
428426
path = "module/core/strs_tools"
429427
default-features = false
430428

431429
[workspace.dependencies.strs_tools_meta]
432-
version = "~0.5.0"
430+
version = "~0.6.0"
433431
path = "module/core/strs_tools_meta"
434432
default-features = false
435433

@@ -451,7 +449,7 @@ path = "module/alias/file_tools"
451449
default-features = false
452450

453451
[workspace.dependencies.pth]
454-
version = "~0.24.0"
452+
version = "~0.25.0"
455453
path = "module/core/pth"
456454
default-features = false
457455

@@ -464,7 +462,7 @@ default-features = false
464462
## process tools
465463

466464
[workspace.dependencies.process_tools]
467-
version = "~0.14.0"
465+
version = "~0.15.0"
468466
path = "module/core/process_tools"
469467
default-features = false
470468

@@ -483,7 +481,6 @@ path = "module/alias/wtest"
483481
[workspace.dependencies.test_tools]
484482
version = "~0.16.0"
485483
path = "module/core/test_tools"
486-
features = [ "full" ]
487484

488485
# [workspace.dependencies.test_tools_stable]
489486
# package = "test_tools"
@@ -525,7 +522,7 @@ default-features = false
525522
## ca
526523

527524
[workspace.dependencies.wca]
528-
version = "~0.27.0"
525+
version = "~0.28.0"
529526
path = "module/move/wca"
530527

531528
## censor
@@ -538,7 +535,7 @@ path = "module/move/wcensor"
538535
## willbe
539536

540537
[workspace.dependencies.willbe]
541-
version = "~0.23.0"
538+
version = "~0.24.0"
542539
path = "module/move/willbe"
543540

544541

@@ -577,7 +574,7 @@ version = "~0.6.0"
577574
path = "module/move/deterministic_rand"
578575

579576
[workspace.dependencies.crates_tools]
580-
version = "~0.16.0"
577+
version = "~0.17.0"
581578
path = "module/move/crates_tools"
582579

583580
[workspace.dependencies.assistant]
@@ -589,7 +586,7 @@ version = "~0.2.0"
589586
path = "module/move/llm_tools"
590587

591588
[workspace.dependencies.benchkit]
592-
version = "~0.4.0"
589+
version = "~0.5.0"
593590
path = "module/move/benchkit"
594591

595592
## steps
@@ -634,7 +631,6 @@ version = "0.1.83"
634631

635632
[workspace.dependencies.tokio]
636633
version = "1.41.0"
637-
features = []
638634
default-features = false
639635

640636
# Note: anyhow and thiserror are included here ONLY for bootstrap builds
@@ -673,6 +669,18 @@ version = "~0.2"
673669
[workspace.dependencies.rand]
674670
version = "0.8.5"
675671

672+
[workspace.dependencies.rand_chacha]
673+
version = "0.3.1"
674+
675+
[workspace.dependencies.rand_seeder]
676+
version = "0.3.0"
677+
678+
[workspace.dependencies.sealed]
679+
version = "0.5.0"
680+
681+
[workspace.dependencies.rayon]
682+
version = "1.8.0"
683+
676684
[workspace.dependencies.trybuild]
677685
version = "1.0.85"
678686

@@ -754,15 +762,12 @@ version = "0.18.1"
754762

755763
[workspace.dependencies.toml]
756764
version = "0.8.23"
757-
features = [ "preserve_order" ]
758765

759766
[workspace.dependencies.chrono]
760767
version = "0.4.34"
761-
features = [ "serde" ]
762768

763769
[workspace.dependencies.criterion]
764770
version = "0.5.1"
765-
features = [ "html_reports" ]
766771

767772
[workspace.dependencies.workspace_tools]
768773
version = "~0.2.0"

Makefile

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ PKG_FLAGS = $(if $(crate),-p $(crate))
2727
wtest2 \
2828
wtest3 \
2929
wtest4 \
30-
wtest5
30+
wtest5 \
31+
clean-cache-files
3132

3233
#
3334
# === Help ===
@@ -61,6 +62,9 @@ help:
6162
@echo " wtest4 [crate=..] - Watch Level 4: All checks + Heavy testing (deps + audit)."
6263
@echo " wtest5 [crate=..] - Watch Level 5: Full heavy testing with mutations."
6364
@echo ""
65+
@echo "Cache Management:"
66+
@echo " clean-cache-files - Add hyphen prefix to cache files for git exclusion."
67+
@echo ""
6468

6569

6670
#
@@ -163,7 +167,8 @@ ctest4:
163167
RUSTDOCFLAGS="-D warnings" cargo test --doc --all-features $(PKG_FLAGS) && \
164168
cargo clippy --all-targets --all-features $(PKG_FLAGS) -- -D warnings && \
165169
cargo +nightly udeps --all-targets --all-features $(PKG_FLAGS) && \
166-
cargo +nightly audit --all-features $(PKG_FLAGS)
170+
cargo +nightly audit --all-features $(PKG_FLAGS) && \
171+
$(MAKE) --no-print-directory clean-cache-files
167172

168173
# Test Level 5: Full heavy testing with mutation tests.
169174
#
@@ -177,7 +182,8 @@ ctest5:
177182
cargo clippy --all-targets --all-features $(PKG_FLAGS) -- -D warnings && \
178183
willbe .test dry:0 && \
179184
cargo +nightly udeps --all-targets --all-features $(PKG_FLAGS) && \
180-
cargo +nightly audit --all-features $(PKG_FLAGS)
185+
cargo +nightly audit --all-features $(PKG_FLAGS) && \
186+
$(MAKE) --no-print-directory clean-cache-files
181187

182188
#
183189
# === Watch Commands ===
@@ -213,12 +219,30 @@ wtest3:
213219
# make wtest4 [crate=name]
214220
wtest4:
215221
@echo "Watching Level 4: All checks + Heavy testing..."
216-
@cargo watch -c --shell "RUSTFLAGS=\"-D warnings\" cargo nextest run --all-features $(PKG_FLAGS) && RUSTDOCFLAGS=\"-D warnings\" cargo test --doc --all-features $(PKG_FLAGS) && cargo clippy --all-targets --all-features $(PKG_FLAGS) -- -D warnings && cargo +nightly udeps --all-targets --all-features $(PKG_FLAGS) && cargo +nightly audit --all-features $(PKG_FLAGS)"
222+
@cargo watch -c --shell "RUSTFLAGS=\"-D warnings\" cargo nextest run --all-features $(PKG_FLAGS) && RUSTDOCFLAGS=\"-D warnings\" cargo test --doc --all-features $(PKG_FLAGS) && cargo clippy --all-targets --all-features $(PKG_FLAGS) -- -D warnings && cargo +nightly udeps --all-targets --all-features $(PKG_FLAGS) && cargo +nightly audit --all-features $(PKG_FLAGS) && make --no-print-directory clean-cache-files"
217223

218224
# Watch Level 5: Full heavy testing with mutations.
219225
#
220226
# Usage :
221227
# make wtest5 [crate=name]
222228
wtest5:
223229
@echo "Watching Level 5: Full heavy testing..."
224-
@cargo watch -c --shell "RUSTFLAGS=\"-D warnings\" cargo nextest run --all-features $(PKG_FLAGS) && RUSTDOCFLAGS=\"-D warnings\" cargo test --doc --all-features $(PKG_FLAGS) && cargo clippy --all-targets --all-features $(PKG_FLAGS) -- -D warnings && willbe .test dry:0 && cargo +nightly udeps --all-targets --all-features $(PKG_FLAGS) && cargo +nightly audit --all-features $(PKG_FLAGS)"
230+
@cargo watch -c --shell "RUSTFLAGS=\"-D warnings\" cargo nextest run --all-features $(PKG_FLAGS) && RUSTDOCFLAGS=\"-D warnings\" cargo test --doc --all-features $(PKG_FLAGS) && cargo clippy --all-targets --all-features $(PKG_FLAGS) -- -D warnings && willbe .test dry:0 && cargo +nightly udeps --all-targets --all-features $(PKG_FLAGS) && cargo +nightly audit --all-features $(PKG_FLAGS) && make --no-print-directory clean-cache-files"
231+
232+
#
233+
# === Cache Cleanup ===
234+
#
235+
236+
# Clean cache files created by cargo audit and other tools by adding hyphen prefix.
237+
# This ensures they are ignored by git while preserving the data for future runs.
238+
#
239+
# Usage :
240+
# make clean-cache-files
241+
clean-cache-files:
242+
@echo "Cleaning cache files (adding hyphen prefix for git exclusion)..."
243+
@if [ -d "advisory-db" ]; then mv advisory-db -advisory-db 2>/dev/null || true; fi
244+
@if [ -f "advisory-db..lock" ]; then mv advisory-db..lock -advisory-db..lock 2>/dev/null || true; fi
245+
@if [ -d ".global-cache" ]; then mv .global-cache -.global-cache 2>/dev/null || true; fi
246+
@if [ -d ".package-cache" ]; then mv .package-cache -.package-cache 2>/dev/null || true; fi
247+
@if [ -d "registry" ]; then mv registry -registry 2>/dev/null || true; fi
248+
@echo "Cache files cleaned successfully."

module/alias/cargo_will/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ willbe = { workspace = true }
3636
error_tools = { workspace = true }
3737

3838
# [dev-dependencies]
39-
# test_tools = { workspace = true }
39+
# test_tools = { workspace = true, features = [ "full" ] }
4040
# assert_fs = "1.0"
4141
# serde_yaml = "0.9"
4242
# serde_json = "1.0.114"

0 commit comments

Comments
 (0)