nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-11 06:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

libsyntax: change attr:get_attr_name to take a ref

Browse Source
This commit is contained in:
Erick Tryzelaar 2013-02-11 08:34:00 -08:00
parent bc62bd3782
commit 1a5b8e4aba
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc/front/test.rs
View File

@ -111,7 +111,7 @@ fn fold_mod(cx: @mut TestCtxt,
fn nomain(cx: @mut TestCtxt, item: @ast::item) -> @ast::item { fn nomain(cx: @mut TestCtxt, item: @ast::item) -> @ast::item {
if !*cx.sess.building_library { if !*cx.sess.building_library {
@ast::item{attrs: item.attrs.filtered(|attr| { @ast::item{attrs: item.attrs.filtered(|attr| {
attr::get_attr_name(*attr) != ~"main" attr::get_attr_name(attr) != ~"main"
}),.. copy *item} }),.. copy *item}
} else { item } } else { item }
} }

2
src/librustc/metadata/encoder.rs
View File

@ -1097,7 +1097,7 @@ fn synthesize_crate_attrs(ecx: @encode_ctxt, crate: &crate) -> ~[attribute] {
let mut found_link_attr = false; let mut found_link_attr = false;
for crate.node.attrs.each |attr| { for crate.node.attrs.each |attr| {
attrs.push( attrs.push(
if attr::get_attr_name(*attr) != ~"link" { if attr::get_attr_name(attr) != ~"link" {
/*bad*/copy *attr /*bad*/copy *attr
} else { } else {
match /*bad*/copy attr.node.value.node { match /*bad*/copy attr.node.value.node {

13
src/libsyntax/attr.rs
View File

@ -90,7 +90,7 @@ pub fn desugar_doc_attr(attr: &ast::attribute) -> ast::attribute {
/* Accessors */ /* Accessors */
pub fn get_attr_name(attr: ast::attribute) -> ~str { pub fn get_attr_name(attr: &ast::attribute) -> ~str {
get_meta_item_name(@attr.node.value) get_meta_item_name(@attr.node.value)
} }
@ -146,14 +146,13 @@ pub fn get_name_value_str_pair(item: @ast::meta_item)
/// Search a list of attributes and return only those with a specific name /// Search a list of attributes and return only those with a specific name
pub fn find_attrs_by_name(attrs: &[ast::attribute], name: &str) -> pub fn find_attrs_by_name(attrs: &[ast::attribute], name: &str) ->
~[ast::attribute] { ~[ast::attribute] {
let filter: &fn(a: &ast::attribute) -> Option<ast::attribute> = |a| { do vec::filter_mapped(attrs) |a| {
if name == get_attr_name(*a) { if name == get_attr_name(a) {
option::Some(*a) Some(*a)
} else { } else {
option::None None
}
} }
};
return vec::filter_mapped(attrs, filter);
} }
/// Search a list of meta items and return only those with a specific name /// Search a list of meta items and return only those with a specific name

4
src/libsyntax/ext/auto_encode.rs
View File

@ -114,7 +114,7 @@ pub fn expand_auto_encode(
in_items: ~[@ast::item] in_items: ~[@ast::item]
) -> ~[@ast::item] { ) -> ~[@ast::item] {
fn is_auto_encode(a: &ast::attribute) -> bool { fn is_auto_encode(a: &ast::attribute) -> bool {
attr::get_attr_name(*a) == ~"auto_encode" attr::get_attr_name(a) == ~"auto_encode"
} }
fn filter_attrs(item: @ast::item) -> @ast::item { fn filter_attrs(item: @ast::item) -> @ast::item {
@ -169,7 +169,7 @@ pub fn expand_auto_decode(
in_items: ~[@ast::item] in_items: ~[@ast::item]
) -> ~[@ast::item] { ) -> ~[@ast::item] {
fn is_auto_decode(a: &ast::attribute) -> bool { fn is_auto_decode(a: &ast::attribute) -> bool {
attr::get_attr_name(*a) == ~"auto_decode" attr::get_attr_name(a) == ~"auto_decode"
} }
fn filter_attrs(item: @ast::item) -> @ast::item { fn filter_attrs(item: @ast::item) -> @ast::item {