Skip to content

Commit 998a7a7

Browse files
brsonbrson
committed
---
yaml --- r: 14500 b: refs/heads/try c: c15127f h: refs/heads/master v: v3
1 parent 91d8727 commit 998a7a7

File tree

9 files changed

+24
-24
lines changed

9 files changed

+24
-24
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: a11638f0d9e75881a567979a3274d8514e9cf46c
5+
refs/heads/try: c15127fe3ece95eacc9839458710d6e72bd014af
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

‎branches/try/src/rustdoc/attr_pass.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ fn merge_arg_attrs(
154154
docs: [doc::argdoc],
155155
attrs: [attr_parser::arg_attrs]
156156
) -> [doc::argdoc] {
157-
vec::map(docs) {|doc|
157+
util::anymap(docs) {|doc|
158158
alt vec::find(attrs) {|attr|
159159
attr.name == doc.name
160160
} {
@@ -239,7 +239,7 @@ fn fold_enum(
239239
let doc = fold::default_seq_fold_enum(fold, doc);
240240

241241
{
242-
variants: vec::map(doc.variants) {|variant|
242+
variants: util::anymap(doc.variants) {|variant|
243243
let attrs = astsrv::exec(srv) {|ctxt|
244244
alt check ctxt.ast_map.get(doc.id()) {
245245
ast_map::node_item(@{
@@ -288,7 +288,7 @@ fn fold_res(
288288
let attrs = parse_item_attrs(srv, doc.id(), attr_parser::parse_res);
289289

290290
{
291-
args: vec::map(doc.args) {|doc|
291+
args: util::anymap(doc.args) {|doc|
292292
alt vec::find(attrs.args) {|attr|
293293
attr.name == doc.name
294294
} {
@@ -349,7 +349,7 @@ fn merge_method_attrs(
349349
ast_map::node_item(@{
350350
node: ast::item_iface(_, methods), _
351351
}, _) {
352-
vec::map(methods) {|method|
352+
util::seqmap(methods) {|method|
353353
(method.ident,
354354
(attr_parser::parse_basic(method.attrs),
355355
attr_parser::parse_method(method.attrs)
@@ -359,7 +359,7 @@ fn merge_method_attrs(
359359
ast_map::node_item(@{
360360
node: ast::item_impl(_, _, _, methods), _
361361
}, _) {
362-
vec::map(methods) {|method|
362+
util::seqmap(methods) {|method|
363363
(method.ident,
364364
(attr_parser::parse_basic(method.attrs),
365365
attr_parser::parse_method(method.attrs)

‎branches/try/src/rustdoc/desc_pass.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn fold_fn(fold: fold::fold<op>, doc: doc::fndoc) -> doc::fndoc {
4545
let doc = fold::default_seq_fold_fn(fold, doc);
4646

4747
{
48-
args: vec::map(doc.args) {|doc|
48+
args: util::anymap(doc.args) {|doc|
4949
{
5050
desc: maybe_apply_op(fold.ctxt, doc.desc)
5151
with doc
@@ -64,7 +64,7 @@ fn fold_enum(fold: fold::fold<op>, doc: doc::enumdoc) -> doc::enumdoc {
6464
let doc = fold::default_seq_fold_enum(fold, doc);
6565

6666
{
67-
variants: vec::map(doc.variants) {|variant|
67+
variants: util::anymap(doc.variants) {|variant|
6868
{
6969
desc: maybe_apply_op(fold.ctxt, variant.desc)
7070
with variant
@@ -78,7 +78,7 @@ fn fold_res(fold: fold::fold<op>, doc: doc::resdoc) -> doc::resdoc {
7878
let doc = fold::default_seq_fold_res(fold, doc);
7979

8080
{
81-
args: vec::map(doc.args) {|arg|
81+
args: util::anymap(doc.args) {|arg|
8282
{
8383
desc: maybe_apply_op(fold.ctxt, arg.desc)
8484
with arg
@@ -98,11 +98,11 @@ fn fold_iface(fold: fold::fold<op>, doc: doc::ifacedoc) -> doc::ifacedoc {
9898
}
9999

100100
fn apply_to_methods(op: op, docs: [doc::methoddoc]) -> [doc::methoddoc] {
101-
vec::map(docs) {|doc|
101+
util::anymap(docs) {|doc|
102102
{
103103
brief: maybe_apply_op(op, doc.brief),
104104
desc: maybe_apply_op(op, doc.desc),
105-
args: vec::map(doc.args) {|doc|
105+
args: util::anymap(doc.args) {|doc|
106106
{
107107
desc: maybe_apply_op(op, doc.desc)
108108
with doc

‎branches/try/src/rustdoc/desc_to_brief_pass.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fn fold_iface(fold: fold::fold<()>, doc: doc::ifacedoc) -> doc::ifacedoc {
4141
let doc =fold::default_seq_fold_iface(fold, doc);
4242

4343
{
44-
methods: vec::map(doc.methods) {|doc|
44+
methods: util::anymap(doc.methods) {|doc|
4545
let (brief, desc) = modify(doc.brief, doc.desc);
4646

4747
{
@@ -58,7 +58,7 @@ fn fold_impl(fold: fold::fold<()>, doc: doc::impldoc) -> doc::impldoc {
5858
let doc =fold::default_seq_fold_impl(fold, doc);
5959

6060
{
61-
methods: vec::map(doc.methods) {|doc|
61+
methods: util::anymap(doc.methods) {|doc|
6262
let (brief, desc) = modify(doc.brief, doc.desc);
6363

6464
{

‎branches/try/src/rustdoc/extract.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ fn nmoddoc_from_mod(
112112
) -> doc::nmoddoc {
113113
{
114114
item: itemdoc,
115-
fns: vec::map(module.items) {|item|
115+
fns: util::seqmap(module.items) {|item|
116116
let itemdoc = mk_itemdoc(item.id, item.ident);
117117
alt item.node {
118118
ast::native_item_fn(decl, _) {
@@ -150,7 +150,7 @@ fn should_extract_fn_args() {
150150
}
151151

152152
fn argdocs_from_args(args: [ast::arg]) -> [doc::argdoc] {
153-
vec::map(args, argdoc_from_arg)
153+
util::seqmap(args, argdoc_from_arg)
154154
}
155155

156156
fn argdoc_from_arg(arg: ast::arg) -> doc::argdoc {
@@ -188,7 +188,7 @@ fn enumdoc_from_enum(
188188
fn variantdocs_from_variants(
189189
variants: [ast::variant]
190190
) -> [doc::variantdoc] {
191-
vec::map(variants, variantdoc_from_variant)
191+
util::seqmap(variants, variantdoc_from_variant)
192192
}
193193

194194
fn variantdoc_from_variant(variant: ast::variant) -> doc::variantdoc {
@@ -242,7 +242,7 @@ fn ifacedoc_from_iface(
242242
) -> doc::ifacedoc {
243243
{
244244
item: itemdoc,
245-
methods: vec::map(methods) {|method|
245+
methods: util::seqmap(methods) {|method|
246246
{
247247
name: method.ident,
248248
brief: none,
@@ -285,7 +285,7 @@ fn impldoc_from_impl(
285285
item: itemdoc,
286286
iface_ty: none,
287287
self_ty: none,
288-
methods: vec::map(methods) {|method|
288+
methods: util::seqmap(methods) {|method|
289289
{
290290
name: method.ident,
291291
brief: none,

‎branches/try/src/rustdoc/markdown_pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ fn write_sig(ctxt: ctxt, sig: option<str>) {
228228

229229
fn code_block_indent(s: str) -> str {
230230
let lines = str::lines_any(s);
231-
let indented = vec::map(lines, { |line| #fmt(" %s", line) });
231+
let indented = util::anymap(lines, { |line| #fmt(" %s", line) });
232232
str::connect(indented, "\n")
233233
}
234234

‎branches/try/src/rustdoc/prune_undoc_details_pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ fn fold_iface(
105105
}
106106

107107
fn prune_methods(docs: [doc::methoddoc]) -> [doc::methoddoc] {
108-
vec::map(docs) {|doc|
108+
util::anymap(docs) {|doc|
109109
{
110110
args: prune_args(doc.args),
111111
return: prune_return(doc.return)

‎branches/try/src/rustdoc/tystr_pass.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ fn get_arg_tys(srv: astsrv::srv, fn_id: doc::ast_id) -> [(str, str)] {
165165
}
166166

167167
fn decl_arg_tys(decl: ast::fn_decl) -> [(str, str)] {
168-
vec::map(decl.inputs) {|arg|
168+
util::seqmap(decl.inputs) {|arg|
169169
(arg.ident, pprust::ty_to_str(arg.ty))
170170
}
171171
}
@@ -217,7 +217,7 @@ fn fold_enum(
217217
let srv = fold.ctxt;
218218

219219
{
220-
variants: vec::map(doc.variants) {|variant|
220+
variants: util::anymap(doc.variants) {|variant|
221221
let sig = astsrv::exec(srv) {|ctxt|
222222
alt check ctxt.ast_map.get(doc.id()) {
223223
ast_map::node_item(@{
@@ -296,7 +296,7 @@ fn merge_methods(
296296
item_id: doc::ast_id,
297297
docs: [doc::methoddoc]
298298
) -> [doc::methoddoc] {
299-
vec::map(docs) {|doc|
299+
util::anymap(docs) {|doc|
300300
{
301301
args: merge_method_arg_tys(
302302
srv,

‎branches/try/src/rustdoc/unindent_pass.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ fn unindent(s: str) -> str {
6363

6464
if check vec::is_not_empty(lines) {
6565
let unindented = [str::trim(vec::head(lines))]
66-
+ vec::map(vec::tail(lines)) {|line|
66+
+ util::anymap(vec::tail(lines)) {|line|
6767
if str::is_whitespace(line) {
6868
line
6969
} else {

0 commit comments

Comments
 (0)