Merge pull request #7595 from thestinger/iterator

remove some method resolve workarounds

diff --cc src/libstd/str.rs
Simple merge

diff --cc src/test/run-pass/test-ignore-cfg.rs
index e54bc7404b4403547edb57360fd59a060f041700,068f18ac0f83aa1c7f053b3667fbc99d4884483c..6e6670e4c38e9c8fc41843615474def34810d885
--- 1/src/test/run-pass/test-ignore-cfg.rs
--- 2/src/test/run-pass/test-ignore-cfg.rs
+++ b/src/test/run-pass/test-ignore-cfg.rs
@@@ -26,11 -26,11 +26,11 @@@ fn shouldnotignore() 
  #[test]
  fn checktests() {
      // Pull the tests out of the secreturn test module
 -    let tests = __test::tests;
 +    let tests = __test::TESTS;
  
      assert!(
-         tests.iter().any_(|t| t.desc.name.to_str() == ~"shouldignore" && t.desc.ignore));
+         tests.iter().any(|t| t.desc.name.to_str() == ~"shouldignore" && t.desc.ignore));
  
      assert!(
-         tests.iter().any_(|t| t.desc.name.to_str() == ~"shouldnotignore" && !t.desc.ignore));
+         tests.iter().any(|t| t.desc.name.to_str() == ~"shouldnotignore" && !t.desc.ignore));
  }