Skip to content

Commit c73343f

Browse files
authored
Merge pull request #167 from NathanReb/fix-rule-deps
Remove extra package deps on mdx
2 parents be2dd2e + 1da8234 commit c73343f

File tree

2 files changed

+22
-47
lines changed

2 files changed

+22
-47
lines changed

bin/rule.ml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ let print_rule ~nd ~prelude ~md_file ~ml_files ~dirs ~root ~requires options =
7878
"\
7979
(alias\n\
8080
\ (name %s)\n\
81-
\ (deps (:x %s)\n\
82-
\ (package mdx)%s)\n\
81+
\ (deps (:x %s)%s)\n\
8382
\ (action (progn\n\
8483
\ (run ocaml-mdx test %a %s%s%%{x})\n%a\n\
8584
\ (diff? %%{x} %%{x}.corrected))))\n"

test/dune.inc

Lines changed: 21 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,175 +1,153 @@
11
(alias
22
(name runtest)
3-
(deps (:x pp.md)
4-
(package mdx))
3+
(deps (:x pp.md))
54
(action (progn
65
(run ocaml-mdx test --direction=infer-timestamp %{x})
76

87
(diff? %{x} %{x}.corrected))))
98
(alias
109
(name runtest)
11-
(deps (:x ellipsis.md)
12-
(package mdx))
10+
(deps (:x ellipsis.md))
1311
(action (progn
1412
(run ocaml-mdx test --direction=infer-timestamp %{x})
1513

1614
(diff? %{x} %{x}.corrected))))
1715
(alias
1816
(name runtest)
19-
(deps (:x envs.md)
20-
(package mdx))
17+
(deps (:x envs.md))
2118
(action (progn
2219
(run ocaml-mdx test --direction=infer-timestamp %{x})
2320

2421
(diff? %{x} %{x}.corrected))))
2522
(alias
2623
(name runtest)
27-
(deps (:x empty_line.md)
28-
(package mdx))
24+
(deps (:x empty_line.md))
2925
(action (progn
3026
(run ocaml-mdx test --direction=infer-timestamp %{x})
3127

3228
(diff? %{x} %{x}.corrected))))
3329
(alias
3430
(name runtest)
35-
(deps (:x spaces.md)
36-
(package mdx))
31+
(deps (:x spaces.md))
3732
(action (progn
3833
(run ocaml-mdx test --direction=infer-timestamp %{x})
3934

4035
(diff? %{x} %{x}.corrected))))
4136
(alias
4237
(name runtest)
43-
(deps (:x errors.md)
44-
(package mdx))
38+
(deps (:x errors.md))
4539
(action (progn
4640
(run ocaml-mdx test --direction=infer-timestamp %{x})
4741

4842
(diff? %{x} %{x}.corrected))))
4943
(alias
5044
(name runtest-all)
51-
(deps (:x errors.md)
52-
(package mdx))
45+
(deps (:x errors.md))
5346
(action (progn
5447
(run ocaml-mdx test --direction=infer-timestamp --non-deterministic %{x})
5548

5649
(diff? %{x} %{x}.corrected))))
5750
(alias
5851
(name runtest)
59-
(deps (:x heredoc.md)
60-
(package mdx))
52+
(deps (:x heredoc.md))
6153
(action (progn
6254
(run ocaml-mdx test --direction=infer-timestamp %{x})
6355

6456
(diff? %{x} %{x}.corrected))))
6557
(alias
6658
(name runtest)
67-
(deps (:x mlt.md)
68-
(package mdx))
59+
(deps (:x mlt.md))
6960
(action (progn
7061
(run ocaml-mdx test --direction=infer-timestamp %{x})
7162

7263
(diff? %{x} %{x}.corrected))))
7364
(alias
7465
(name runtest)
75-
(deps (:x semisemi.md)
76-
(package mdx))
66+
(deps (:x semisemi.md))
7767
(action (progn
7868
(run ocaml-mdx test --direction=infer-timestamp %{x})
7969

8070
(diff? %{x} %{x}.corrected))))
8171
(alias
8272
(name runtest)
83-
(deps (:x exit.md)
84-
(package mdx))
73+
(deps (:x exit.md))
8574
(action (progn
8675
(run ocaml-mdx test --direction=infer-timestamp %{x})
8776

8877
(diff? %{x} %{x}.corrected))))
8978
(alias
9079
(name runtest)
91-
(deps (:x padding.md)
92-
(package mdx))
80+
(deps (:x padding.md))
9381
(action (progn
9482
(run ocaml-mdx test --direction=infer-timestamp %{x})
9583

9684
(diff? %{x} %{x}.corrected))))
9785
(alias
9886
(name runtest)
99-
(deps (:x multilines.md)
100-
(package mdx))
87+
(deps (:x multilines.md))
10188
(action (progn
10289
(run ocaml-mdx test --direction=infer-timestamp %{x})
10390

10491
(diff? %{x} %{x}.corrected))))
10592
(alias
10693
(name runtest)
107-
(deps (:x lines.md)
108-
(package mdx))
94+
(deps (:x lines.md))
10995
(action (progn
11096
(run ocaml-mdx test --direction=infer-timestamp %{x})
11197

11298
(diff? %{x} %{x}.corrected))))
11399
(alias
114100
(name runtest)
115-
(deps (:x lwt.md)
116-
(package mdx))
101+
(deps (:x lwt.md))
117102
(action (progn
118103
(run ocaml-mdx test --direction=infer-timestamp %{x})
119104

120105
(diff? %{x} %{x}.corrected))))
121106
(alias
122107
(name runtest)
123-
(deps (:x non-det.md)
124-
(package mdx))
108+
(deps (:x non-det.md))
125109
(action (progn
126110
(run ocaml-mdx test --direction=infer-timestamp %{x})
127111

128112
(diff? %{x} %{x}.corrected))))
129113
(alias
130114
(name runtest-all)
131-
(deps (:x non-det.md)
132-
(package mdx))
115+
(deps (:x non-det.md))
133116
(action (progn
134117
(run ocaml-mdx test --direction=infer-timestamp --non-deterministic %{x})
135118

136119
(diff? %{x} %{x}.corrected))))
137120
(alias
138121
(name runtest)
139-
(deps (:x code.md)
140-
(package mdx))
122+
(deps (:x code.md))
141123
(action (progn
142124
(run ocaml-mdx test --direction=infer-timestamp %{x})
143125

144126
(diff? %{x} %{x}.corrected))))
145127
(alias
146128
(name runtest)
147-
(deps (:x set_environment_variable.md)
148-
(package mdx))
129+
(deps (:x set_environment_variable.md))
149130
(action (progn
150131
(run ocaml-mdx test --direction=infer-timestamp %{x})
151132

152133
(diff? %{x} %{x}.corrected))))
153134
(alias
154135
(name runtest)
155-
(deps (:x unset_environment_variable.md)
156-
(package mdx))
136+
(deps (:x unset_environment_variable.md))
157137
(action (progn
158138
(run ocaml-mdx test --direction=infer-timestamp %{x})
159139

160140
(diff? %{x} %{x}.corrected))))
161141
(alias
162142
(name runtest)
163-
(deps (:x prelude.md)
164-
(package mdx))
143+
(deps (:x prelude.md))
165144
(action (progn
166145
(run ocaml-mdx test --prelude-str "#require \"lwt\"" --prelude-str "toto:let x = \"42\"" --direction=infer-timestamp %{x})
167146

168147
(diff? %{x} %{x}.corrected))))
169148
(alias
170149
(name runtest)
171150
(deps (:x prelude_file.md)
172-
(package mdx)
173151
prelude.ml)
174152
(action (progn
175153
(run ocaml-mdx test --prelude=prelude.ml --direction=infer-timestamp %{x})
@@ -178,7 +156,6 @@
178156
(alias
179157
(name runtest)
180158
(deps (:x dune_rules.md)
181-
(package mdx)
182159
(:y1 dune_rules_1.ml)
183160
(:y0 dune_rules_2.ml)
184161
(source_tree foo))
@@ -190,7 +167,6 @@
190167
(alias
191168
(name runtest)
192169
(deps (:x require/require-package.md)
193-
(package mdx)
194170
(package example_lib))
195171
(action (progn
196172
(run ocaml-mdx test --direction=infer-timestamp %{x})

0 commit comments

Comments
 (0)