Skip to content

Commit e44467a

Browse files
committed
rustdoc: Add resources to the doc fold
1 parent 23e9f7a commit e44467a

File tree

1 file changed

+31
-4
lines changed

1 file changed

+31
-4
lines changed

src/rustdoc/fold.rs

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,15 @@ type fold_mod<T> = fn~(fold: fold<T>, doc: doc::moddoc) -> doc::moddoc;
1818
type fold_fn<T> = fn~(fold: fold<T>, doc: doc::fndoc) -> doc::fndoc;
1919
type fold_const<T> = fn~(fold: fold<T>, doc: doc::constdoc) -> doc::constdoc;
2020
type fold_enum<T> = fn~(fold: fold<T>, doc: doc::enumdoc) -> doc::enumdoc;
21+
type fold_res<T> = fn~(fold: fold<T>, doc: doc::resdoc) -> doc::resdoc;
2122
type fold_modlist<T> = fn~(fold: fold<T>, list: doc::modlist) -> doc::modlist;
2223
type fold_fnlist<T> = fn~(fold: fold<T>, list: doc::fnlist) -> doc::fnlist;
2324
type fold_constlist<T> = fn~(
2425
fold: fold<T>, list: doc::constlist) -> doc::constlist;
2526
type fold_enumlist<T> = fn~(
2627
fold: fold<T>, list: doc::enumlist) -> doc::enumlist;
28+
type fold_reslist<T> = fn~(
29+
fold: fold<T>, list: doc::reslist) -> doc::reslist;
2730

2831
type t<T> = {
2932
ctxt: T,
@@ -32,10 +35,12 @@ type t<T> = {
3235
fold_fn: fold_fn<T>,
3336
fold_const: fold_const<T>,
3437
fold_enum: fold_enum<T>,
38+
fold_res: fold_res<T>,
3539
fold_modlist: fold_modlist<T>,
3640
fold_fnlist: fold_fnlist<T>,
3741
fold_constlist: fold_constlist<T>,
38-
fold_enumlist: fold_enumlist<T>
42+
fold_enumlist: fold_enumlist<T>,
43+
fold_reslist: fold_reslist<T>
3944
};
4045

4146

@@ -48,10 +53,12 @@ fn mk_fold<T:copy>(
4853
fold_fn: fold_fn<T>,
4954
fold_const: fold_const<T>,
5055
fold_enum: fold_enum<T>,
56+
fold_res: fold_res<T>,
5157
fold_modlist: fold_modlist<T>,
5258
fold_fnlist: fold_fnlist<T>,
5359
fold_constlist: fold_constlist<T>,
54-
fold_enumlist: fold_enumlist<T>
60+
fold_enumlist: fold_enumlist<T>,
61+
fold_reslist: fold_reslist<T>
5562
) -> fold<T> {
5663
fold({
5764
ctxt: ctxt,
@@ -60,10 +67,12 @@ fn mk_fold<T:copy>(
6067
fold_fn: fold_fn,
6168
fold_const: fold_const,
6269
fold_enum: fold_enum,
70+
fold_res: fold_res,
6371
fold_modlist: fold_modlist,
6472
fold_fnlist: fold_fnlist,
6573
fold_constlist: fold_constlist,
66-
fold_enumlist: fold_enumlist
74+
fold_enumlist: fold_enumlist,
75+
fold_reslist: fold_reslist
6776
})
6877
}
6978

@@ -75,10 +84,12 @@ fn default_seq_fold<T:copy>(ctxt: T) -> fold<T> {
7584
{|f, d| default_seq_fold_fn(f, d)},
7685
{|f, d| default_seq_fold_const(f, d)},
7786
{|f, d| default_seq_fold_enum(f, d)},
87+
{|f, d| default_seq_fold_res(f, d)},
7888
{|f, d| default_seq_fold_modlist(f, d)},
7989
{|f, d| default_seq_fold_fnlist(f, d)},
8090
{|f, d| default_seq_fold_constlist(f, d)},
81-
{|f, d| default_seq_fold_enumlist(f, d)}
91+
{|f, d| default_seq_fold_enumlist(f, d)},
92+
{|f, d| default_seq_fold_reslist(f, d)}
8293
)
8394
}
8495

@@ -125,6 +136,13 @@ fn default_seq_fold_enum<T>(
125136
doc
126137
}
127138

139+
fn default_seq_fold_res<T>(
140+
_fold: fold<T>,
141+
doc: doc::resdoc
142+
) -> doc::resdoc {
143+
doc
144+
}
145+
128146
fn default_seq_fold_modlist<T>(
129147
fold: fold<T>,
130148
list: doc::modlist
@@ -161,6 +179,15 @@ fn default_seq_fold_enumlist<T>(
161179
})
162180
}
163181

182+
fn default_seq_fold_reslist<T>(
183+
fold: fold<T>,
184+
list: doc::reslist
185+
) -> doc::reslist {
186+
doc::reslist(vec::map(*list) {|doc|
187+
fold.fold_res(fold, doc)
188+
})
189+
}
190+
164191
#[test]
165192
fn default_fold_should_produce_same_doc() {
166193
let source = "mod a { fn b() { } mod c { fn d() { } } }";

0 commit comments

Comments
 (0)