Skip to content

Commit e10600d

Browse files
brsonbrson
committed
---
yaml --- r: 10900 b: refs/heads/master c: fe745f1 h: refs/heads/master v: v3
1 parent 3cc73f0 commit e10600d

14 files changed

+125
-124
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: 0e498da47e265b5bb7a4f59bbed53bc843bd83cc
2+
refs/heads/master: fe745f1b5dd0d53c127b19608449506f91e94c21
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

‎trunk/src/rustdoc/attr_pass.rs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ fn fold_crate(
4444
attr_parser::parse_crate(attrs)
4545
};
4646

47-
~{
48-
topmod: ~{
47+
{
48+
topmod: {
4949
name: option::from_maybe(doc.topmod.name, attrs.name)
50-
with *doc.topmod
50+
with doc.topmod
5151
}
5252
}
5353
}
@@ -91,10 +91,10 @@ fn fold_mod(fold: fold::fold<astsrv::srv>, doc: doc::moddoc) -> doc::moddoc {
9191
doc: doc::moddoc,
9292
attrs: attr_parser::mod_attrs
9393
) -> doc::moddoc {
94-
~{
94+
{
9595
brief: attrs.brief,
9696
desc: attrs.desc
97-
with *doc
97+
with doc
9898
}
9999
}
100100
}
@@ -133,13 +133,13 @@ fn fold_fn(
133133
doc: doc::fndoc,
134134
attrs: attr_parser::fn_attrs
135135
) -> doc::fndoc {
136-
ret ~{
136+
ret {
137137
brief: attrs.brief,
138138
desc: attrs.desc,
139139
args: merge_arg_attrs(doc.args, attrs.args),
140140
return: merge_ret_attrs(doc.return, attrs.return),
141141
failure: attrs.failure
142-
with *doc
142+
with doc
143143
};
144144
}
145145

@@ -152,9 +152,9 @@ fn fold_fn(
152152
attr.name == doc.name
153153
} {
154154
some(attr) {
155-
~{
155+
{
156156
desc: some(attr.desc)
157-
with *doc
157+
with doc
158158
}
159159
}
160160
none { doc }
@@ -233,10 +233,10 @@ fn fold_const(
233233
let srv = fold.ctxt;
234234
let attrs = parse_item_attrs(srv, doc.id, attr_parser::parse_const);
235235

236-
~{
236+
{
237237
brief: attrs.brief,
238238
desc: attrs.desc
239-
with *doc
239+
with doc
240240
}
241241
}
242242

@@ -259,7 +259,7 @@ fn fold_enum(
259259
let srv = fold.ctxt;
260260
let attrs = parse_item_attrs(srv, doc.id, attr_parser::parse_enum);
261261

262-
~{
262+
{
263263
brief: attrs.brief,
264264
desc: attrs.desc,
265265
variants: vec::map(doc.variants) {|variant|
@@ -278,12 +278,12 @@ fn fold_enum(
278278
}
279279
};
280280

281-
~{
281+
{
282282
desc: attrs.desc
283-
with *variant
283+
with variant
284284
}
285285
}
286-
with *doc
286+
with doc
287287
}
288288
}
289289

@@ -317,23 +317,23 @@ fn fold_res(
317317
let srv = fold.ctxt;
318318
let attrs = parse_item_attrs(srv, doc.id, attr_parser::parse_fn);
319319

320-
~{
320+
{
321321
brief: attrs.brief,
322322
desc: attrs.desc,
323323
args: vec::map(doc.args) {|doc|
324324
alt vec::find(attrs.args) {|attr|
325325
attr.name == doc.name
326326
} {
327327
some(attr) {
328-
~{
328+
{
329329
desc: some(attr.desc)
330-
with *doc
330+
with doc
331331
}
332332
}
333333
none { doc }
334334
}
335335
}
336-
with *doc
336+
with doc
337337
}
338338
}
339339

‎trunk/src/rustdoc/desc_pass.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,69 +33,69 @@ fn maybe_apply_op(op: op, s: option<str>) -> option<str> {
3333
fn fold_mod(fold: fold::fold<op>, doc: doc::moddoc) -> doc::moddoc {
3434
let doc = fold::default_seq_fold_mod(fold, doc);
3535

36-
~{
36+
{
3737
brief: maybe_apply_op(fold.ctxt, doc.brief),
3838
desc: maybe_apply_op(fold.ctxt, doc.desc)
39-
with *doc
39+
with doc
4040
}
4141
}
4242

4343
fn fold_const(fold: fold::fold<op>, doc: doc::constdoc) -> doc::constdoc {
4444
let doc = fold::default_seq_fold_const(fold, doc);
4545

46-
~{
46+
{
4747
brief: maybe_apply_op(fold.ctxt, doc.brief),
4848
desc: maybe_apply_op(fold.ctxt, doc.desc)
49-
with *doc
49+
with doc
5050
}
5151
}
5252

5353
fn fold_fn(fold: fold::fold<op>, doc: doc::fndoc) -> doc::fndoc {
5454
let doc = fold::default_seq_fold_fn(fold, doc);
5555

56-
~{
56+
{
5757
brief: maybe_apply_op(fold.ctxt, doc.brief),
5858
desc: maybe_apply_op(fold.ctxt, doc.desc),
5959
args: vec::map(doc.args) {|doc|
60-
~{
60+
{
6161
desc: maybe_apply_op(fold.ctxt, doc.desc)
62-
with *doc
62+
with doc
6363
}
6464
},
6565
return: {
6666
desc: maybe_apply_op(fold.ctxt, doc.return.desc)
6767
with doc.return
6868
},
6969
failure: maybe_apply_op(fold.ctxt, doc.failure)
70-
with *doc
70+
with doc
7171
}
7272
}
7373

7474
fn fold_enum(fold: fold::fold<op>, doc: doc::enumdoc) -> doc::enumdoc {
75-
~{
75+
{
7676
brief: maybe_apply_op(fold.ctxt, doc.brief),
7777
desc: maybe_apply_op(fold.ctxt, doc.desc),
7878
variants: vec::map(doc.variants) {|variant|
79-
~{
79+
{
8080
desc: maybe_apply_op(fold.ctxt, variant.desc)
81-
with *variant
81+
with variant
8282
}
8383
}
84-
with *doc
84+
with doc
8585
}
8686
}
8787

8888
fn fold_res(fold: fold::fold<op>, doc: doc::resdoc) -> doc::resdoc {
89-
~{
89+
{
9090
brief: maybe_apply_op(fold.ctxt, doc.brief),
9191
desc: maybe_apply_op(fold.ctxt, doc.desc),
9292
args: vec::map(doc.args) {|arg|
93-
~{
93+
{
9494
desc: maybe_apply_op(fold.ctxt, arg.desc)
95-
with *arg
95+
with arg
9696
}
9797
}
98-
with *doc
98+
with doc
9999
}
100100
}
101101

‎trunk/src/rustdoc/desc_to_brief_pass.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,54 +32,54 @@ fn fold_mod(fold: fold::fold<()>, doc: doc::moddoc) -> doc::moddoc {
3232
let doc = fold::default_seq_fold_mod(fold, doc);
3333
let (brief, desc) = modify(doc.brief, doc.desc);
3434

35-
~{
35+
{
3636
brief: brief,
3737
desc: desc
38-
with *doc
38+
with doc
3939
}
4040
}
4141

4242
fn fold_const(fold: fold::fold<()>, doc: doc::constdoc) -> doc::constdoc {
4343
let doc = fold::default_seq_fold_const(fold, doc);
4444
let (brief, desc) = modify(doc.brief, doc.desc);
4545

46-
~{
46+
{
4747
brief: brief,
4848
desc: desc
49-
with *doc
49+
with doc
5050
}
5151
}
5252

5353
fn fold_fn(fold: fold::fold<()>, doc: doc::fndoc) -> doc::fndoc {
5454
let doc = fold::default_seq_fold_fn(fold, doc);
5555
let (brief, desc) = modify(doc.brief, doc.desc);
5656

57-
~{
57+
{
5858
brief: brief,
5959
desc: desc
60-
with *doc
60+
with doc
6161
}
6262
}
6363

6464
fn fold_enum(fold: fold::fold<()>, doc: doc::enumdoc) -> doc::enumdoc {
6565
let doc = fold::default_seq_fold_enum(fold, doc);
6666
let (brief, desc) = modify(doc.brief, doc.desc);
6767

68-
~{
68+
{
6969
brief: brief,
7070
desc: desc
71-
with *doc
71+
with doc
7272
}
7373
}
7474

7575
fn fold_res(fold: fold::fold<()>, doc: doc::resdoc) -> doc::resdoc {
7676
let doc = fold::default_seq_fold_res(fold, doc);
7777
let (brief, desc) = modify(doc.brief, doc.desc);
7878

79-
~{
79+
{
8080
brief: brief,
8181
desc: desc
82-
with *doc
82+
with doc
8383
}
8484
}
8585

0 commit comments

Comments
 (0)