---

yaml
---
r: 60317
b: refs/heads/master
c: 133aabc
h: refs/heads/master
i:
  60315: 15658e5
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7ba685c7abe3f4e76d7e720277c1070c4dafb88b
+refs/heads/master: 133aabc5bb6786ff7038886baf5fefde974e460a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589

trunk/src/libcore/to_bytes.rs

@@ -458,7 +458,6 @@ pub fn iter_bytes_2<A:IterBytes,B:IterBytes>(a: &A, b: &B,
     b.iter_bytes(lsb0, |bytes| {flag = z(bytes); flag});
 }
 #[cfg(not(stage0))]
-#[inline(always)]
 pub fn iter_bytes_2<A:IterBytes,B:IterBytes>(a: &A, b: &B,
                                              lsb0: bool, z: Cb) -> bool {
     a.iter_bytes(lsb0, z) && b.iter_bytes(lsb0, z)

trunk/src/libstd/flatpipes.rs

@@ -639,6 +639,7 @@ mod test {
     use core::io::BytesWriter;
 
     #[test]
+    #[ignore(reason = "ebml failure")]
     fn test_serializing_memory_stream() {
         let writer = BytesWriter();
         let chan = serial::writer_chan(writer);
@@ -671,6 +672,7 @@ mod test {
     }
 
     #[test]
+    #[ignore(reason = "ebml failure")]
     fn test_serializing_boxes() {
         let (port, chan) = serial::pipe_stream();
 

trunk/src/libsyntax/ast.rs

@@ -98,14 +98,12 @@ impl<D:Decoder> Decodable<D> for ident {
 
 #[cfg(stage0)]
 impl to_bytes::IterBytes for ident {
-    #[inline(always)]
     fn iter_bytes(&self, lsb0: bool, f: to_bytes::Cb) {
         self.repr.iter_bytes(lsb0, f)
     }
 }
 #[cfg(not(stage0))]
 impl to_bytes::IterBytes for ident {
-    #[inline(always)]
     fn iter_bytes(&self, lsb0: bool, f: to_bytes::Cb) -> bool {
         self.repr.iter_bytes(lsb0, f)
     }

trunk/src/libsyntax/parse/token.rs

@@ -357,14 +357,12 @@ impl<'self> Equiv<@~str> for StringRef<'self> {
 
 #[cfg(stage0)]
 impl<'self> to_bytes::IterBytes for StringRef<'self> {
-    #[inline(always)]
     fn iter_bytes(&self, lsb0: bool, f: to_bytes::Cb) {
         (**self).iter_bytes(lsb0, f);
     }
 }
 #[cfg(not(stage0))]
 impl<'self> to_bytes::IterBytes for StringRef<'self> {
-    #[inline(always)]
     fn iter_bytes(&self, lsb0: bool, f: to_bytes::Cb) -> bool {
         (**self).iter_bytes(lsb0, f)
     }