From a32498d8464e0dfa4e2cb31967a66e076da40109 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Thu, 31 Jan 2013 17:12:29 -0800 Subject: Make ~fn non-copyable, make &fn copyable, split barefn/closure types, correct handling of moves for struct-record update. Part of #3678. Fixes #2828, #3904, #4719. --- src/libsyntax/attr.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libsyntax/attr.rs') diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index ca28641c4a3..c347c04641f 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -154,7 +154,7 @@ pub fn find_attrs_by_name(attrs: &[ast::attribute], name: &str) -> option::None } }; - return vec::filter_map(attrs, filter); + return vec::filter_mapped(attrs, filter); } /// Search a list of meta items and return only those with a specific name @@ -277,9 +277,9 @@ pub fn sort_meta_items(+items: ~[@ast::meta_item]) -> ~[@ast::meta_item] { pub fn remove_meta_items_by_name(items: ~[@ast::meta_item], name: ~str) -> ~[@ast::meta_item] { - return vec::filter_map(items, |item| { + return vec::filter_mapped(items, |item| { if get_meta_item_name(*item) != name { - option::Some(/* FIXME (#2543) */ copy *item) + option::Some(*item) } else { option::None } -- cgit 1.4.1-3-g733a5