about summary refs log tree commit diff
path: root/src/libstd/io
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2014-07-21 20:54:28 -0700
committerPatrick Walton <pcwalton@mimiga.net>2014-07-24 18:58:12 -0700
commitcaa564bea3d5f5a24d0797c4769184c1ea0abaff (patch)
treef0f1b5d284efe24018586e85fb5b442e8b578283 /src/libstd/io
parent7f2e63ec3f6f03ac9273a9f166a4ce8deff48097 (diff)
downloadrust-caa564bea3d5f5a24d0797c4769184c1ea0abaff.tar.gz
rust-caa564bea3d5f5a24d0797c4769184c1ea0abaff.zip
librustc: Stop desugaring `for` expressions and translate them directly.
This makes edge cases in which the `Iterator` trait was not in scope
and/or `Option` or its variants were not in scope work properly.

This breaks code that looks like:

    struct MyStruct { ... }

    impl MyStruct {
        fn next(&mut self) -> Option<int> { ... }
    }

    for x in MyStruct { ... } { ... }

Change ad-hoc `next` methods like the above to implementations of the
`Iterator` trait. For example:

    impl Iterator<int> for MyStruct {
        fn next(&mut self) -> Option<int> { ... }
    }

Closes #15392.

[breaking-change]
Diffstat (limited to 'src/libstd/io')
-rw-r--r--src/libstd/io/tempfile.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstd/io/tempfile.rs b/src/libstd/io/tempfile.rs
index 5ca7e417af6..f580dfd80f0 100644
--- a/src/libstd/io/tempfile.rs
+++ b/src/libstd/io/tempfile.rs
@@ -12,7 +12,7 @@
 
 use io::{fs, IoResult};
 use io;
-use iter::{Iterator, range};
+use iter::range;
 use libc;
 use ops::Drop;
 use option::{Option, None, Some};
@@ -21,6 +21,9 @@ use path::{Path, GenericPath};
 use result::{Ok, Err};
 use sync::atomics;
 
+#[cfg(stage0)]
+use iter::Iterator; // NOTE(stage0): Remove after snapshot.
+
 /// A wrapper for a path to temporary directory implementing automatic
 /// scope-based deletion.
 pub struct TempDir {