Skip to content

Commit 7a74f19

Browse files
committed
---
yaml --- r: 11347 b: refs/heads/master c: 3760168 h: refs/heads/master i: 11345: eef77cc 11343: e61f78f v: v3
1 parent a785809 commit 7a74f19

File tree

2 files changed

+50
-15
lines changed

2 files changed

+50
-15
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 5e376b78cf22222091fd050af81fba6a634c6482
2+
refs/heads/master: 37601684c90587abe2cc29fecc71e6cb252632d8
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustdoc/fold.rs

Lines changed: 49 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ export fold;
22
export fold_crate, fold_mod, fold_fn;
33
export default_seq_fold;
44
export default_seq_fold_crate;
5+
export default_seq_fold_item;
56
export default_seq_fold_mod;
67
export default_seq_fold_fn;
78
export default_seq_fold_const;
@@ -14,6 +15,7 @@ export default_seq_fold_type;
1415
enum fold<T> = t<T>;
1516

1617
type fold_crate<T> = fn~(fold: fold<T>, doc: doc::cratedoc) -> doc::cratedoc;
18+
type fold_item<T> = fn~(fold: fold<T>, doc: doc::itemdoc) -> doc::itemdoc;
1719
type fold_mod<T> = fn~(fold: fold<T>, doc: doc::moddoc) -> doc::moddoc;
1820
type fold_fn<T> = fn~(fold: fold<T>, doc: doc::fndoc) -> doc::fndoc;
1921
type fold_const<T> = fn~(fold: fold<T>, doc: doc::constdoc) -> doc::constdoc;
@@ -26,6 +28,7 @@ type fold_type<T> = fn~(fold: fold<T>, doc: doc::tydoc) -> doc::tydoc;
2628
type t<T> = {
2729
ctxt: T,
2830
fold_crate: fold_crate<T>,
31+
fold_item: fold_item<T>,
2932
fold_mod: fold_mod<T>,
3033
fold_fn: fold_fn<T>,
3134
fold_const: fold_const<T>,
@@ -42,6 +45,7 @@ type t<T> = {
4245
fn mk_fold<T:copy>(
4346
ctxt: T,
4447
fold_crate: fold_crate<T>,
48+
fold_item: fold_item<T>,
4549
fold_mod: fold_mod<T>,
4650
fold_fn: fold_fn<T>,
4751
fold_const: fold_const<T>,
@@ -54,6 +58,7 @@ fn mk_fold<T:copy>(
5458
fold({
5559
ctxt: ctxt,
5660
fold_crate: fold_crate,
61+
fold_item: fold_item,
5762
fold_mod: fold_mod,
5863
fold_fn: fold_fn,
5964
fold_const: fold_const,
@@ -69,6 +74,7 @@ fn default_seq_fold<T:copy>(ctxt: T) -> fold<T> {
6974
mk_fold(
7075
ctxt,
7176
{|f, d| default_seq_fold_crate(f, d)},
77+
{|f, d| default_seq_fold_item(f, d)},
7278
{|f, d| default_seq_fold_mod(f, d)},
7379
{|f, d| default_seq_fold_fn(f, d)},
7480
{|f, d| default_seq_fold_const(f, d)},
@@ -89,11 +95,19 @@ fn default_seq_fold_crate<T>(
8995
}
9096
}
9197

98+
fn default_seq_fold_item<T>(
99+
_fold: fold<T>,
100+
doc: doc::itemdoc
101+
) -> doc::itemdoc {
102+
doc
103+
}
104+
92105
fn default_seq_fold_mod<T>(
93106
fold: fold<T>,
94107
doc: doc::moddoc
95108
) -> doc::moddoc {
96109
{
110+
item: fold.fold_item(fold, doc.item),
97111
items: ~vec::map(*doc.items) {|itemtag|
98112
alt itemtag {
99113
doc::modtag(moddoc) {
@@ -127,52 +141,73 @@ fn default_seq_fold_mod<T>(
127141
}
128142

129143
fn default_seq_fold_fn<T>(
130-
_fold: fold<T>,
144+
fold: fold<T>,
131145
doc: doc::fndoc
132146
) -> doc::fndoc {
133-
doc
147+
{
148+
item: fold.fold_item(fold, doc.item)
149+
with doc
150+
}
134151
}
135152

136153
fn default_seq_fold_const<T>(
137-
_fold: fold<T>,
154+
fold: fold<T>,
138155
doc: doc::constdoc
139156
) -> doc::constdoc {
140-
doc
157+
{
158+
item: fold.fold_item(fold, doc.item)
159+
with doc
160+
}
141161
}
142162

143163
fn default_seq_fold_enum<T>(
144-
_fold: fold<T>,
164+
fold: fold<T>,
145165
doc: doc::enumdoc
146166
) -> doc::enumdoc {
147-
doc
167+
{
168+
item: fold.fold_item(fold, doc.item)
169+
with doc
170+
}
148171
}
149172

150173
fn default_seq_fold_res<T>(
151-
_fold: fold<T>,
174+
fold: fold<T>,
152175
doc: doc::resdoc
153176
) -> doc::resdoc {
154-
doc
177+
{
178+
item: fold.fold_item(fold, doc.item)
179+
with doc
180+
}
155181
}
156182

157183
fn default_seq_fold_iface<T>(
158-
_fold: fold<T>,
184+
fold: fold<T>,
159185
doc: doc::ifacedoc
160186
) -> doc::ifacedoc {
161-
doc
187+
{
188+
item: fold.fold_item(fold, doc.item)
189+
with doc
190+
}
162191
}
163192

164193
fn default_seq_fold_impl<T>(
165-
_fold: fold<T>,
194+
fold: fold<T>,
166195
doc: doc::impldoc
167196
) -> doc::impldoc {
168-
doc
197+
{
198+
item: fold.fold_item(fold, doc.item)
199+
with doc
200+
}
169201
}
170202

171203
fn default_seq_fold_type<T>(
172-
_fold: fold<T>,
204+
fold: fold<T>,
173205
doc: doc::tydoc
174206
) -> doc::tydoc {
175-
doc
207+
{
208+
item: fold.fold_item(fold, doc.item)
209+
with doc
210+
}
176211
}
177212

178213
#[test]

0 commit comments

Comments
 (0)