Skip to content

Commit 98675e6

Browse files
fantaziofantazio
committed
[examples][dune] move all unwrapped_lib uses in a subdir
This is in preparation of adding a `wrapped_lib` that will follow the same architecture and usage as `unwrapped_lib`. Having both mixed together in `bin/` would be too noisy. Hence, creating a `bin/use_unwrapped_lib` subdir will isolate their use. Later, a `bin/use_wrapped_lib` will do as well.
1 parent aa0fd47 commit 98675e6

33 files changed

+93
-73
lines changed

‎check/threshold-1/threshold-1.exp‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,19 @@
5555

5656
.>-> ALMOST UNUSED EXPORTED VALUES: Called 1 time(s):
5757
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
58-
./examples/using_dune/bin/use_constructors.mli:1: mark_used
59-
./examples/using_dune/bin/use_mixed_args.mli:1: mark_used
60-
./examples/using_dune/bin/use_opt_args.mli:1: mark_used
61-
./examples/using_dune/bin/use_opt_args_in_higher_order_fun.mli:1: mark_used
62-
./examples/using_dune/bin/use_records.mli:1: mark_used
63-
./examples/using_dune/bin/use_style.mli:1: mark_used
64-
./examples/using_dune/bin/use_values.mli:1: mark_used
65-
./examples/using_dune/bin/use_values_in_submodules.mli:1: mark_used
66-
./examples/using_dune/bin/use_values_in_submodules_no_intf.mli:1: mark_used
67-
./examples/using_dune/bin/use_values_no_intf.mli:1: mark_used
68-
./examples/using_dune/bin/use_with_class.mli:1: mark_used
69-
./examples/using_dune/bin/use_without_class.mli:1: mark_used
58+
./examples/using_dune/bin/use_unwrapped_lib/use_constructors.mli:1: mark_used
59+
./examples/using_dune/bin/use_unwrapped_lib/use_mixed_args.mli:1: mark_used
60+
./examples/using_dune/bin/use_unwrapped_lib/use_opt_args.mli:1: mark_used
61+
./examples/using_dune/bin/use_unwrapped_lib/use_opt_args_in_higher_order_fun.mli:1: mark_used
62+
./examples/using_dune/bin/use_unwrapped_lib/use_records.mli:1: mark_used
63+
./examples/using_dune/bin/use_unwrapped_lib/use_style.mli:1: mark_used
64+
./examples/using_dune/bin/use_unwrapped_lib/use_unwrapped_lib.mli:1: mark_used
65+
./examples/using_dune/bin/use_unwrapped_lib/use_values.mli:1: mark_used
66+
./examples/using_dune/bin/use_unwrapped_lib/use_values_in_submodules.mli:1: mark_used
67+
./examples/using_dune/bin/use_unwrapped_lib/use_values_in_submodules_no_intf.mli:1: mark_used
68+
./examples/using_dune/bin/use_unwrapped_lib/use_values_no_intf.mli:1: mark_used
69+
./examples/using_dune/bin/use_unwrapped_lib/use_with_class.mli:1: mark_used
70+
./examples/using_dune/bin/use_unwrapped_lib/use_without_class.mli:1: mark_used
7071

7172
./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:8: internally_used_fun_with_single_never_used_opt_arg
7273
./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:10: internally_used_fun_with_single_always_used_opt_arg
@@ -508,3 +509,5 @@ Nothing else to report in this section
508509

509510
Nothing else to report in this section
510511
--------------------------------------------------------------------------------
512+
513+

‎check/threshold-1/threshold-1.ref‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,19 @@
5555

5656
.>-> ALMOST UNUSED EXPORTED VALUES: Called 1 time(s):
5757
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
58-
./examples/using_dune/bin/use_constructors.mli:1: mark_used
59-
./examples/using_dune/bin/use_mixed_args.mli:1: mark_used
60-
./examples/using_dune/bin/use_opt_args.mli:1: mark_used
61-
./examples/using_dune/bin/use_opt_args_in_higher_order_fun.mli:1: mark_used
62-
./examples/using_dune/bin/use_records.mli:1: mark_used
63-
./examples/using_dune/bin/use_style.mli:1: mark_used
64-
./examples/using_dune/bin/use_values.mli:1: mark_used
65-
./examples/using_dune/bin/use_values_in_submodules.mli:1: mark_used
66-
./examples/using_dune/bin/use_values_in_submodules_no_intf.mli:1: mark_used
67-
./examples/using_dune/bin/use_values_no_intf.mli:1: mark_used
68-
./examples/using_dune/bin/use_with_class.mli:1: mark_used
69-
./examples/using_dune/bin/use_without_class.mli:1: mark_used
58+
./examples/using_dune/bin/use_unwrapped_lib/use_constructors.mli:1: mark_used
59+
./examples/using_dune/bin/use_unwrapped_lib/use_mixed_args.mli:1: mark_used
60+
./examples/using_dune/bin/use_unwrapped_lib/use_opt_args.mli:1: mark_used
61+
./examples/using_dune/bin/use_unwrapped_lib/use_opt_args_in_higher_order_fun.mli:1: mark_used
62+
./examples/using_dune/bin/use_unwrapped_lib/use_records.mli:1: mark_used
63+
./examples/using_dune/bin/use_unwrapped_lib/use_style.mli:1: mark_used
64+
./examples/using_dune/bin/use_unwrapped_lib/use_unwrapped_lib.mli:1: mark_used
65+
./examples/using_dune/bin/use_unwrapped_lib/use_values.mli:1: mark_used
66+
./examples/using_dune/bin/use_unwrapped_lib/use_values_in_submodules.mli:1: mark_used
67+
./examples/using_dune/bin/use_unwrapped_lib/use_values_in_submodules_no_intf.mli:1: mark_used
68+
./examples/using_dune/bin/use_unwrapped_lib/use_values_no_intf.mli:1: mark_used
69+
./examples/using_dune/bin/use_unwrapped_lib/use_with_class.mli:1: mark_used
70+
./examples/using_dune/bin/use_unwrapped_lib/use_without_class.mli:1: mark_used
7071

7172
./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:8: internally_used_fun_with_single_never_used_opt_arg
7273
./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:10: internally_used_fun_with_single_always_used_opt_arg
@@ -510,7 +511,7 @@ Nothing else to report in this section
510511
--------------------------------------------------------------------------------
511512

512513

513-
Total: 427
514-
Success: 427
514+
Total: 428
515+
Success: 428
515516
Failed: 0
516517
Ratio: 100.%

‎check/threshold-3-0.5/threshold-3-0.5.exp‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,19 @@
5555

5656
.>-> ALMOST UNUSED EXPORTED VALUES: Called 1 time(s):
5757
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
58-
./examples/using_dune/bin/use_constructors.mli:1: mark_used
59-
./examples/using_dune/bin/use_mixed_args.mli:1: mark_used
60-
./examples/using_dune/bin/use_opt_args.mli:1: mark_used
61-
./examples/using_dune/bin/use_opt_args_in_higher_order_fun.mli:1: mark_used
62-
./examples/using_dune/bin/use_records.mli:1: mark_used
63-
./examples/using_dune/bin/use_style.mli:1: mark_used
64-
./examples/using_dune/bin/use_values.mli:1: mark_used
65-
./examples/using_dune/bin/use_values_in_submodules.mli:1: mark_used
66-
./examples/using_dune/bin/use_values_in_submodules_no_intf.mli:1: mark_used
67-
./examples/using_dune/bin/use_values_no_intf.mli:1: mark_used
68-
./examples/using_dune/bin/use_with_class.mli:1: mark_used
69-
./examples/using_dune/bin/use_without_class.mli:1: mark_used
58+
./examples/using_dune/bin/use_unwrapped_lib/use_constructors.mli:1: mark_used
59+
./examples/using_dune/bin/use_unwrapped_lib/use_mixed_args.mli:1: mark_used
60+
./examples/using_dune/bin/use_unwrapped_lib/use_opt_args.mli:1: mark_used
61+
./examples/using_dune/bin/use_unwrapped_lib/use_opt_args_in_higher_order_fun.mli:1: mark_used
62+
./examples/using_dune/bin/use_unwrapped_lib/use_records.mli:1: mark_used
63+
./examples/using_dune/bin/use_unwrapped_lib/use_style.mli:1: mark_used
64+
./examples/using_dune/bin/use_unwrapped_lib/use_unwrapped_lib.mli:1: mark_used
65+
./examples/using_dune/bin/use_unwrapped_lib/use_values.mli:1: mark_used
66+
./examples/using_dune/bin/use_unwrapped_lib/use_values_in_submodules.mli:1: mark_used
67+
./examples/using_dune/bin/use_unwrapped_lib/use_values_in_submodules_no_intf.mli:1: mark_used
68+
./examples/using_dune/bin/use_unwrapped_lib/use_values_no_intf.mli:1: mark_used
69+
./examples/using_dune/bin/use_unwrapped_lib/use_with_class.mli:1: mark_used
70+
./examples/using_dune/bin/use_unwrapped_lib/use_without_class.mli:1: mark_used
7071

7172
./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:8: internally_used_fun_with_single_never_used_opt_arg
7273
./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:10: internally_used_fun_with_single_always_used_opt_arg
@@ -727,3 +728,5 @@ Nothing else to report in this section
727728

728729
Nothing else to report in this section
729730
--------------------------------------------------------------------------------
731+
732+

‎check/threshold-3-0.5/threshold-3-0.5.ref‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,19 @@
5555

5656
.>-> ALMOST UNUSED EXPORTED VALUES: Called 1 time(s):
5757
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
58-
./examples/using_dune/bin/use_constructors.mli:1: mark_used
59-
./examples/using_dune/bin/use_mixed_args.mli:1: mark_used
60-
./examples/using_dune/bin/use_opt_args.mli:1: mark_used
61-
./examples/using_dune/bin/use_opt_args_in_higher_order_fun.mli:1: mark_used
62-
./examples/using_dune/bin/use_records.mli:1: mark_used
63-
./examples/using_dune/bin/use_style.mli:1: mark_used
64-
./examples/using_dune/bin/use_values.mli:1: mark_used
65-
./examples/using_dune/bin/use_values_in_submodules.mli:1: mark_used
66-
./examples/using_dune/bin/use_values_in_submodules_no_intf.mli:1: mark_used
67-
./examples/using_dune/bin/use_values_no_intf.mli:1: mark_used
68-
./examples/using_dune/bin/use_with_class.mli:1: mark_used
69-
./examples/using_dune/bin/use_without_class.mli:1: mark_used
58+
./examples/using_dune/bin/use_unwrapped_lib/use_constructors.mli:1: mark_used
59+
./examples/using_dune/bin/use_unwrapped_lib/use_mixed_args.mli:1: mark_used
60+
./examples/using_dune/bin/use_unwrapped_lib/use_opt_args.mli:1: mark_used
61+
./examples/using_dune/bin/use_unwrapped_lib/use_opt_args_in_higher_order_fun.mli:1: mark_used
62+
./examples/using_dune/bin/use_unwrapped_lib/use_records.mli:1: mark_used
63+
./examples/using_dune/bin/use_unwrapped_lib/use_style.mli:1: mark_used
64+
./examples/using_dune/bin/use_unwrapped_lib/use_unwrapped_lib.mli:1: mark_used
65+
./examples/using_dune/bin/use_unwrapped_lib/use_values.mli:1: mark_used
66+
./examples/using_dune/bin/use_unwrapped_lib/use_values_in_submodules.mli:1: mark_used
67+
./examples/using_dune/bin/use_unwrapped_lib/use_values_in_submodules_no_intf.mli:1: mark_used
68+
./examples/using_dune/bin/use_unwrapped_lib/use_values_no_intf.mli:1: mark_used
69+
./examples/using_dune/bin/use_unwrapped_lib/use_with_class.mli:1: mark_used
70+
./examples/using_dune/bin/use_unwrapped_lib/use_without_class.mli:1: mark_used
7071

7172
./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:8: internally_used_fun_with_single_never_used_opt_arg
7273
./examples/using_dune/unwrapped_lib/opt_args/opt_args.mli:10: internally_used_fun_with_single_always_used_opt_arg
@@ -729,7 +730,7 @@ Nothing else to report in this section
729730
--------------------------------------------------------------------------------
730731

731732

732-
Total: 586
733-
Success: 586
733+
Total: 587
734+
Success: 587
734735
Failed: 0
735736
Ratio: 100.%

‎examples/using_dune/bin/dune‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
(executable
22
(name using_dune)
3-
(libraries unwrapped_lib))
3+
(libraries use_unwrapped_lib))

‎examples/using_dune/bin/use_unwrapped_lib/dune‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
(library
2+
(name use_unwrapped_lib)
3+
(libraries unwrapped_lib)
4+
(wrapped false))

examples/using_dune/bin/use_constructors.ml renamed to examples/using_dune/bin/use_unwrapped_lib/use_constructors.ml

File renamed without changes.

examples/using_dune/bin/use_constructors.mli renamed to examples/using_dune/bin/use_unwrapped_lib/use_constructors.mli

File renamed without changes.

examples/using_dune/bin/use_mixed_args.ml renamed to examples/using_dune/bin/use_unwrapped_lib/use_mixed_args.ml

File renamed without changes.

examples/using_dune/bin/use_mixed_args.mli renamed to examples/using_dune/bin/use_unwrapped_lib/use_mixed_args.mli

File renamed without changes.

0 commit comments

Comments
 (0)