Skip to content

Commit 64b533e

Browse files
committed
---
yaml --- r: 44789 b: refs/heads/master c: da7aedc h: refs/heads/master i: 44787: 73fe13c v: v3
1 parent 6df2b4e commit 64b533e

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
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: 5271464cc0aae453e96ad70a33e0c9636df7f90e
2+
refs/heads/master: da7aedc2306a7ea2efee0864e8bdf6dbf53d73a4
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
55
refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/libsyntax/attr.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ pub fn remove_meta_items_by_name(items: ~[@ast::meta_item], name: &str) ->
300300
pub fn find_linkage_metas(attrs: &[ast::attribute]) -> ~[@ast::meta_item] {
301301
do find_attrs_by_name(attrs, ~"link").flat_map |attr| {
302302
match attr.node.value.node {
303-
ast::meta_list(_, items) => /* FIXME (#2543) */ copy items,
303+
ast::meta_list(_, ref items) => /* FIXME (#2543) */ copy *items,
304304
_ => ~[]
305305
}
306306
}
@@ -347,11 +347,10 @@ pub fn find_inline_attr(attrs: &[ast::attribute]) -> inline_attr {
347347
do vec::foldl(ia_none, attrs) |ia,attr| {
348348
match attr.node.value.node {
349349
ast::meta_word(@~"inline") => ia_hint,
350-
ast::meta_list(@~"inline", items) => {
351-
if !vec::is_empty(find_meta_items_by_name(items, ~"always")) {
350+
ast::meta_list(@~"inline", ref items) => {
351+
if !find_meta_items_by_name(*items, ~"always").is_empty() {
352352
ia_always
353-
} else if !vec::is_empty(
354-
find_meta_items_by_name(items, ~"never")) {
353+
} else if !find_meta_items_by_name(*items, ~"never").is_empty() {
355354
ia_never
356355
} else {
357356
ia_hint

trunk/src/libsyntax/fold.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -372,21 +372,21 @@ fn noop_fold_arm(a: &arm, fld: ast_fold) -> arm {
372372
pub fn noop_fold_pat(p: &pat_, fld: ast_fold) -> pat_ {
373373
match *p {
374374
pat_wild => pat_wild,
375-
pat_ident(binding_mode, pth, sub) => {
375+
pat_ident(binding_mode, pth, ref sub) => {
376376
pat_ident(
377377
binding_mode,
378378
fld.fold_path(pth),
379379
sub.map(|x| fld.fold_pat(*x))
380380
)
381381
}
382382
pat_lit(e) => pat_lit(fld.fold_expr(e)),
383-
pat_enum(pth, pats) => {
383+
pat_enum(pth, ref pats) => {
384384
pat_enum(
385385
fld.fold_path(pth),
386386
pats.map(|pats| pats.map(|x| fld.fold_pat(*x)))
387387
)
388388
}
389-
pat_rec(fields, etc) => {
389+
pat_rec(ref fields, etc) => {
390390
let fs = do fields.map |f| {
391391
ast::field_pat {
392392
ident: /* FIXME (#2543) */ copy f.ident,
@@ -395,7 +395,7 @@ pub fn noop_fold_pat(p: &pat_, fld: ast_fold) -> pat_ {
395395
};
396396
pat_rec(fs, etc)
397397
}
398-
pat_struct(pth, fields, etc) => {
398+
pat_struct(pth, ref fields, etc) => {
399399
let pth_ = fld.fold_path(pth);
400400
let fs = do fields.map |f| {
401401
ast::field_pat {
@@ -412,7 +412,7 @@ pub fn noop_fold_pat(p: &pat_, fld: ast_fold) -> pat_ {
412412
pat_range(e1, e2) => {
413413
pat_range(fld.fold_expr(e1), fld.fold_expr(e2))
414414
},
415-
pat_vec(elts, tail) => {
415+
pat_vec(ref elts, ref tail) => {
416416
pat_vec(
417417
elts.map(|x| fld.fold_pat(*x)),
418418
tail.map(|tail| fld.fold_pat(*tail))
@@ -423,7 +423,7 @@ pub fn noop_fold_pat(p: &pat_, fld: ast_fold) -> pat_ {
423423

424424
fn noop_fold_decl(d: &decl_, fld: ast_fold) -> decl_ {
425425
match *d {
426-
decl_local(ls) => decl_local(ls.map(|x| fld.fold_local(*x))),
426+
decl_local(ref ls) => decl_local(ls.map(|x| fld.fold_local(*x))),
427427
decl_item(it) => {
428428
match fld.fold_item(it) {
429429
Some(it_folded) => decl_item(it_folded),

0 commit comments

Comments
 (0)