Skip to content

Commit ed42f26

Browse files
committed
rustdoc: Fix build errors
1 parent 8766c2e commit ed42f26

8 files changed

+19
-17
lines changed

src/rustdoc/attr_pass.rs

+1
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ fn fold_enum(
144144

145145
{
146146
variants: do par::map(doc.variants) |variant| {
147+
let variant = *variant;
147148
let desc = do astsrv::exec(srv) |ctxt| {
148149
match ctxt.ast_map.get(doc_id) {
149150
ast_map::node_item(@{

src/rustdoc/desc_to_brief_pass.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fn fold_trait(fold: fold::Fold<()>, doc: doc::TraitDoc) -> doc::TraitDoc {
4444
{
4545
methods: par::map(doc.methods, |doc| {
4646
brief: extract(doc.desc),
47-
.. doc
47+
.. *doc
4848
}),
4949
.. doc
5050
}
@@ -56,7 +56,7 @@ fn fold_impl(fold: fold::Fold<()>, doc: doc::ImplDoc) -> doc::ImplDoc {
5656
{
5757
methods: par::map(doc.methods, |doc| {
5858
brief: extract(doc.desc),
59-
.. doc
59+
.. *doc
6060
}),
6161
.. doc
6262
}

src/rustdoc/fold.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ fn default_any_fold_mod<T:Send Copy>(
179179
doc::ModDoc_({
180180
item: fold.fold_item(fold, doc.item),
181181
items: par::map(doc.items, |ItemTag, copy fold| {
182-
fold_ItemTag(fold, ItemTag)
182+
fold_ItemTag(fold, *ItemTag)
183183
}),
184184
.. *doc
185185
})
@@ -205,7 +205,7 @@ fn default_par_fold_mod<T:Send Copy>(
205205
doc::ModDoc_({
206206
item: fold.fold_item(fold, doc.item),
207207
items: par::map(doc.items, |ItemTag, copy fold| {
208-
fold_ItemTag(fold, ItemTag)
208+
fold_ItemTag(fold, *ItemTag)
209209
}),
210210
.. *doc
211211
})
@@ -218,7 +218,7 @@ fn default_any_fold_nmod<T:Send Copy>(
218218
{
219219
item: fold.fold_item(fold, doc.item),
220220
fns: par::map(doc.fns, |FnDoc, copy fold| {
221-
fold.fold_fn(fold, FnDoc)
221+
fold.fold_fn(fold, *FnDoc)
222222
}),
223223
.. doc
224224
}
@@ -244,7 +244,7 @@ fn default_par_fold_nmod<T:Send Copy>(
244244
{
245245
item: fold.fold_item(fold, doc.item),
246246
fns: par::map(doc.fns, |FnDoc, copy fold| {
247-
fold.fold_fn(fold, FnDoc)
247+
fold.fold_fn(fold, *FnDoc)
248248
}),
249249
.. doc
250250
}

src/rustdoc/markdown_index_pass.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fn build_mod_index(
5858
) -> doc::Index {
5959
{
6060
entries: par::map(doc.items, |doc| {
61-
item_to_entry(doc, config)
61+
item_to_entry(*doc, config)
6262
})
6363
}
6464
}
@@ -69,7 +69,7 @@ fn build_nmod_index(
6969
) -> doc::Index {
7070
{
7171
entries: par::map(doc.fns, |doc| {
72-
item_to_entry(doc::FnTag(doc), config)
72+
item_to_entry(doc::FnTag(*doc), config)
7373
})
7474
}
7575
}

src/rustdoc/sectionalize_pass.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fn fold_trait(fold: fold::Fold<()>, doc: doc::TraitDoc) -> doc::TraitDoc {
4242
{
4343
desc: desc,
4444
sections: sections,
45-
..method
45+
.. *method
4646
}
4747
},
4848
.. doc
@@ -59,7 +59,7 @@ fn fold_impl(fold: fold::Fold<()>, doc: doc::ImplDoc) -> doc::ImplDoc {
5959
{
6060
desc: desc,
6161
sections: sections,
62-
.. method
62+
.. *method
6363
}
6464
},
6565
.. doc

src/rustdoc/text_pass.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ fn fold_enum(fold: fold::Fold<Op>, doc: doc::EnumDoc) -> doc::EnumDoc {
6060
variants: do par::map(doc.variants) |variant, copy fold| {
6161
{
6262
desc: maybe_apply_op(fold.ctxt, variant.desc),
63-
.. variant
63+
.. *variant
6464
}
6565
},
6666
.. doc
@@ -82,7 +82,7 @@ fn apply_to_methods(op: Op, docs: ~[doc::MethodDoc]) -> ~[doc::MethodDoc] {
8282
brief: maybe_apply_op(op, doc.brief),
8383
desc: maybe_apply_op(op, doc.desc),
8484
sections: apply_to_sections(op, doc.sections),
85-
.. doc
85+
.. *doc
8686
}
8787
}
8888
}

src/rustdoc/tystr_pass.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ fn fold_enum(
112112

113113
{
114114
variants: do par::map(doc.variants) |variant| {
115+
let variant = *variant;
115116
let sig = do astsrv::exec(srv) |ctxt| {
116117
match ctxt.ast_map.get(doc_id) {
117118
ast_map::node_item(@{
@@ -161,7 +162,7 @@ fn merge_methods(
161162
do par::map(docs) |doc| {
162163
{
163164
sig: get_method_sig(srv, item_id, doc.name),
164-
.. doc
165+
.. *doc
165166
}
166167
}
167168
}

src/rustdoc/unindent_pass.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ fn unindent(s: ~str) -> ~str {
6363
if vec::is_not_empty(lines) {
6464
let unindented = ~[str::trim(vec::head(lines))]
6565
+ do par::map(vec::tail(lines)) |line| {
66-
if str::is_whitespace(line) {
67-
line
66+
if str::is_whitespace(*line) {
67+
*line
6868
} else {
69-
assert str::len(line) >= min_indent;
70-
str::slice(line, min_indent, str::len(line))
69+
assert str::len(*line) >= min_indent;
70+
str::slice(*line, min_indent, str::len(*line))
7171
}
7272
};
7373
str::connect(unindented, ~"\n")

0 commit comments

Comments
 (0)