diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2013-07-08 01:42:07 -0700 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2013-07-08 01:42:07 -0700 |
| commit | 44770ae3a8001de38b33e449889c6444808941fc (patch) | |
| tree | 35b19c50d284bb5a25a3259692dc3783ec95c704 /src/libsyntax | |
| parent | 96ae000812079b284011571dc18fed0d1fb433d8 (diff) | |
| parent | 641aec74076f8c5735a7d379753194f877866525 (diff) | |
| download | rust-44770ae3a8001de38b33e449889c6444808941fc.tar.gz rust-44770ae3a8001de38b33e449889c6444808941fc.zip | |
Merge pull request #7595 from thestinger/iterator
remove some method resolve workarounds
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/attr.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs index d04d96b2481..e4532c476d7 100644 --- a/src/libsyntax/attr.rs +++ b/src/libsyntax/attr.rs @@ -192,7 +192,7 @@ fn eq(a: @ast::meta_item, b: @ast::meta_item) -> bool { ast::meta_list(ref nb, ref misb) => { if na != nb { return false; } for misa.iter().advance |mi| { - if !misb.iter().any_(|x| x == mi) { return false; } + if !misb.iter().any(|x| x == mi) { return false; } } true } diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 940bd5ef61c..71e0d49493b 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -198,7 +198,7 @@ pub fn expand_item(extsbox: @mut SyntaxEnv, // does this attribute list contain "macro_escape" ? pub fn contains_macro_escape (attrs: &[ast::attribute]) -> bool { - attrs.iter().any_(|attr| "macro_escape" == attr::get_attr_name(attr)) + attrs.iter().any(|attr| "macro_escape" == attr::get_attr_name(attr)) } // Support for item-position macro invocations, exactly the same diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 2f79f60fb60..c43b350abdb 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -3914,7 +3914,7 @@ impl Parser { }; let full_path = full_path.normalize(); - let maybe_i = do self.sess.included_mod_stack.iter().position_ |&p| { p == full_path }; + let maybe_i = do self.sess.included_mod_stack.iter().position |&p| { p == full_path }; match maybe_i { Some(i) => { let stack = &self.sess.included_mod_stack; |
