---

yaml
---
r: 79387
b: refs/heads/snap-stage3
c: da042ce
h: refs/heads/master
i:
  79385: 0a464d8
  79383: fc16903
v: v3

Author: chris-morgan

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 124eb2119c78651cfaaa7a046a101fa2e20f83ca
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 41e7924670aefe4c39dd4a060452eb623854fde9
+refs/heads/snap-stage3: da042ce46a022d699dae792164dd180f6dd61894
 refs/heads/try: ac820906c0e53eab79a98ee64f7231f57c3887b4
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/mk/rt.mk

@@ -76,7 +76,6 @@ RUNTIME_CXXS_$(1)_$(2) := \
               rt/rust_upcall.cpp \
               rt/rust_uv.cpp \
               rt/rust_crate_map.cpp \
-              rt/rust_log.cpp \
               rt/isaac/randport.cpp \
               rt/miniz.cpp \
               rt/memory_region.cpp \

branches/snap-stage3/src/librustc/middle/borrowck/gather_loans/mod.rs

@@ -95,11 +95,6 @@ impl visit::Visitor<@mut GatherLoanCtxt> for GatherLoanVisitor {
     fn visit_local(&mut self, l:@Local, e:@mut GatherLoanCtxt) {
         gather_loans_in_local(self, l, e);
     }
-
-    // #7740: Do not visit items here, not even fn items nor methods
-    // of impl items; the outer loop in borrowck/mod will visit them
-    // for us in turn.  Thus override visit_item's walk with a no-op.
-    fn visit_item(&mut self, _:@ast::item, _:@mut GatherLoanCtxt) { }
 }
 
 pub fn gather_loans(bccx: @BorrowckCtxt,
@@ -140,8 +135,10 @@ fn gather_loans_in_fn(v: &mut GatherLoanVisitor,
                       id: ast::NodeId,
                       this: @mut GatherLoanCtxt) {
     match fk {
+        // Do not visit items here, the outer loop in borrowck/mod
+        // will visit them for us in turn.
         &visit::fk_item_fn(*) | &visit::fk_method(*) => {
-            fail!("cannot occur, due to visit_item override");
+            return;
         }
 
         // Visit closures as part of the containing item.

branches/snap-stage3/src/librustpkg/conditions.rs

@@ -14,33 +14,33 @@ pub use std::path::Path;
 pub use package_id::PkgId;
 
 condition! {
-    bad_path: (Path, ~str) -> Path;
+    pub bad_path: (Path, ~str) -> Path;
 }
 
 condition! {
-    nonexistent_package: (PkgId, ~str) -> Path;
+    pub nonexistent_package: (PkgId, ~str) -> Path;
 }
 
 condition! {
-    copy_failed: (Path, Path) -> ();
+    pub copy_failed: (Path, Path) -> ();
 }
 
 condition! {
-    missing_pkg_files: (PkgId) -> ();
+    pub missing_pkg_files: (PkgId) -> ();
 }
 
 condition! {
-    bad_pkg_id: (Path, ~str) -> PkgId;
+    pub bad_pkg_id: (Path, ~str) -> PkgId;
 }
 
 condition! {
-    no_rust_path: (~str) -> Path;
+    pub no_rust_path: (~str) -> Path;
 }
 
 condition! {
-    not_a_workspace: (~str) -> Path;
+    pub not_a_workspace: (~str) -> Path;
 }
 
 condition! {
-    failed_to_create_temp_dir: (~str) -> Path;
+    pub failed_to_create_temp_dir: (~str) -> Path;
 }

branches/snap-stage3/src/librustpkg/package_source.rs

@@ -34,6 +34,7 @@ pub struct PkgSrc {
 }
 
 condition! {
+    // #6009: should this be pub or not, when #8215 is fixed?
     build_err: (~str) -> ();
 }
 

branches/snap-stage3/src/libstd/c_str.rs

@@ -28,10 +28,10 @@ pub enum NullByteResolution {
 }
 
 condition! {
-    // this should be &[u8] but there's a lifetime issue
+    // This should be &[u8] but there's a lifetime issue (#5370).
     // NOTE: this super::NullByteResolution should be NullByteResolution
-    // Change this next time the snapshot it updated.
-    null_byte: (~[u8]) -> super::NullByteResolution;
+    // Change this next time the snapshot is updated.
+    pub null_byte: (~[u8]) -> super::NullByteResolution;
 }
 
 /// The representation of a C String.

branches/snap-stage3/src/libstd/condition.rs

@@ -193,7 +193,8 @@ mod test {
     // Issue #6009
     mod m {
         condition! {
-            sadness: int -> int;
+            // #6009, #8215: should this truly need a `pub` for access from n?
+            pub sadness: int -> int;
         }
 
         mod n {

branches/snap-stage3/src/libstd/rt/io/extensions.rs

@@ -15,8 +15,9 @@
 
 use uint;
 use int;
+use iterator::Iterator;
 use vec;
-use rt::io::{Reader, Writer};
+use rt::io::{Reader, Writer, Decorator};
 use rt::io::{read_error, standard_error, EndOfFile, DEFAULT_BUF_SIZE};
 use option::{Option, Some, None};
 use unstable::finally::Finally;
@@ -62,6 +63,16 @@ pub trait ReaderUtil {
     /// Raises the same conditions as the `read` method.
     fn read_to_end(&mut self) -> ~[u8];
 
+    /// Create an iterator that reads a single byte on
+    /// each iteration, until EOF.
+    ///
+    /// # Failure
+    ///
+    /// Raises the same conditions as the `read` method, for
+    /// each call to its `.next()` method.
+    /// Ends the iteration if the condition is handled.
+    fn bytes(self) -> ByteIterator<Self>;
+
 }
 
 pub trait ReaderByteConversions {
@@ -337,6 +348,41 @@ impl<T: Reader> ReaderUtil for T {
         }
         return buf;
     }
+
+    fn bytes(self) -> ByteIterator<T> {
+        ByteIterator{reader: self}
+    }
+}
+
+/// An iterator that reads a single byte on each iteration,
+/// until `.read_byte()` returns `None`.
+///
+/// # Notes about the Iteration Protocol
+///
+/// The `ByteIterator` may yield `None` and thus terminate
+/// an iteration, but continue to yield elements if iteration
+/// is attempted again.
+///
+/// # Failure
+///
+/// Raises the same conditions as the `read` method, for
+/// each call to its `.next()` method.
+/// Yields `None` if the condition is handled.
+pub struct ByteIterator<T> {
+    priv reader: T,
+}
+
+impl<R> Decorator<R> for ByteIterator<R> {
+    fn inner(self) -> R { self.reader }
+    fn inner_ref<'a>(&'a self) -> &'a R { &self.reader }
+    fn inner_mut_ref<'a>(&'a mut self) -> &'a mut R { &mut self.reader }
+}
+
+impl<'self, R: Reader> Iterator<u8> for ByteIterator<R> {
+    #[inline]
+    fn next(&mut self) -> Option<u8> {
+        self.reader.read_byte()
+    }
 }
 
 impl<T: Reader> ReaderByteConversions for T {
@@ -646,6 +692,48 @@ mod test {
         }
     }
 
+    #[test]
+    fn bytes_0_bytes() {
+        let mut reader = MockReader::new();
+        let count = Cell::new(0);
+        reader.read = |buf| {
+            do count.with_mut_ref |count| {
+                if *count == 0 {
+                    *count = 1;
+                    Some(0)
+                } else {
+                    buf[0] = 10;
+                    Some(1)
+                }
+            }
+        };
+        let byte = reader.bytes().next();
+        assert!(byte == Some(10));
+    }
+
+    #[test]
+    fn bytes_eof() {
+        let mut reader = MockReader::new();
+        reader.read = |_| None;
+        let byte = reader.bytes().next();
+        assert!(byte == None);
+    }
+
+    #[test]
+    fn bytes_error() {
+        let mut reader = MockReader::new();
+        reader.read = |_| {
+            read_error::cond.raise(placeholder_error());
+            None
+        };
+        let mut it = reader.bytes();
+        do read_error::cond.trap(|_| ()).inside {
+            let byte = it.next();
+            assert!(byte == None);
+        }
+    }
+
+
     #[test]
     fn read_bytes() {
         let mut reader = MemReader::new(~[10, 11, 12, 13]);

branches/snap-stage3/src/libstd/rt/io/mod.rs

@@ -384,19 +384,17 @@ impl ToStr for IoErrorKind {
 // XXX: Can't put doc comments on macros
 // Raised by `I/O` operations on error.
 condition! {
-    // FIXME (#6009): uncomment `pub` after expansion support lands.
     // NOTE: this super::IoError should be IoError
-    // Change this next time the snapshot it updated.
-    /*pub*/ io_error: super::IoError -> ();
+    // Change this next time the snapshot is updated.
+    pub io_error: super::IoError -> ();
 }
 
 // XXX: Can't put doc comments on macros
 // Raised by `read` on error
 condition! {
-    // FIXME (#6009): uncomment `pub` after expansion support lands.
     // NOTE: this super::IoError should be IoError
     // Change this next time the snapshot it updated.
-    /*pub*/ read_error: super::IoError -> ();
+    pub read_error: super::IoError -> ();
 }
 
 pub trait Reader {
@@ -453,6 +451,8 @@ pub trait Writer {
 
 pub trait Stream: Reader + Writer { }
 
+impl<T: Reader + Writer> Stream for T;
+
 pub enum SeekStyle {
     /// Seek from the beginning of the stream
     SeekSet,