diff options
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/attr.rs | 9 | ||||
| -rw-r--r-- | src/libsyntax/fold.rs | 12 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index 5b2d6f7600b..e744d19b965 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -300,7 +300,7 @@ pub fn remove_meta_items_by_name(items: ~[@ast::meta_item], name: &str) -> pub fn find_linkage_metas(attrs: &[ast::attribute]) -> ~[@ast::meta_item] { do find_attrs_by_name(attrs, ~"link").flat_map |attr| { match attr.node.value.node { - ast::meta_list(_, items) => /* FIXME (#2543) */ copy items, + ast::meta_list(_, ref items) => /* FIXME (#2543) */ copy *items, _ => ~[] } } @@ -347,11 +347,10 @@ pub fn find_inline_attr(attrs: &[ast::attribute]) -> inline_attr { do vec::foldl(ia_none, attrs) |ia,attr| { match attr.node.value.node { ast::meta_word(@~"inline") => ia_hint, - ast::meta_list(@~"inline", items) => { - if !vec::is_empty(find_meta_items_by_name(items, ~"always")) { + ast::meta_list(@~"inline", ref items) => { + if !find_meta_items_by_name(*items, ~"always").is_empty() { ia_always - } else if !vec::is_empty( - find_meta_items_by_name(items, ~"never")) { + } else if !find_meta_items_by_name(*items, ~"never").is_empty() { ia_never } else { ia_hint diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index d67596e100f..68d05e11171 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -372,7 +372,7 @@ fn noop_fold_arm(a: &arm, fld: ast_fold) -> arm { pub fn noop_fold_pat(p: &pat_, fld: ast_fold) -> pat_ { match *p { pat_wild => pat_wild, - pat_ident(binding_mode, pth, sub) => { + pat_ident(binding_mode, pth, ref sub) => { pat_ident( binding_mode, fld.fold_path(pth), @@ -380,13 +380,13 @@ pub fn noop_fold_pat(p: &pat_, fld: ast_fold) -> pat_ { ) } pat_lit(e) => pat_lit(fld.fold_expr(e)), - pat_enum(pth, pats) => { + pat_enum(pth, ref pats) => { pat_enum( fld.fold_path(pth), pats.map(|pats| pats.map(|x| fld.fold_pat(*x))) ) } - pat_rec(fields, etc) => { + pat_rec(ref fields, etc) => { let fs = do fields.map |f| { ast::field_pat { ident: /* FIXME (#2543) */ copy f.ident, @@ -395,7 +395,7 @@ pub fn noop_fold_pat(p: &pat_, fld: ast_fold) -> pat_ { }; pat_rec(fs, etc) } - pat_struct(pth, fields, etc) => { + pat_struct(pth, ref fields, etc) => { let pth_ = fld.fold_path(pth); let fs = do fields.map |f| { ast::field_pat { @@ -412,7 +412,7 @@ pub fn noop_fold_pat(p: &pat_, fld: ast_fold) -> pat_ { pat_range(e1, e2) => { pat_range(fld.fold_expr(e1), fld.fold_expr(e2)) }, - pat_vec(elts, tail) => { + pat_vec(ref elts, ref tail) => { pat_vec( elts.map(|x| fld.fold_pat(*x)), tail.map(|tail| fld.fold_pat(*tail)) @@ -423,7 +423,7 @@ pub fn noop_fold_pat(p: &pat_, fld: ast_fold) -> pat_ { fn noop_fold_decl(d: &decl_, fld: ast_fold) -> decl_ { match *d { - decl_local(ls) => decl_local(ls.map(|x| fld.fold_local(*x))), + decl_local(ref ls) => decl_local(ls.map(|x| fld.fold_local(*x))), decl_item(it) => { match fld.fold_item(it) { Some(it_folded) => decl_item(it_folded), |