---

yaml
---
r: 54399
b: refs/heads/snap-stage3
c: bda4dd3
h: refs/heads/master
i:
  54397: f3d9de9
  54395: 8bc76e8
  54391: d0c8e14
  54383: a36d94b
  54367: 6be4a9a
  54335: f602f6e
  54271: 76ff768
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 5f13e9ccc2e3328d4cd8ca49f84e6840dd998346
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 518c295a03c5422aec26ac067307c32d11a92e66
+refs/heads/snap-stage3: bda4dd3c911ba54e342de2ff1b59e371442e58dd
 refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/configure

@@ -881,6 +881,10 @@ do
                 ;;
         esac
         need_ok "LLVM configure failed"
+
+        # Hack the tools Makefile to turn off the clang build
+        sed -i 's/clang//g' tools/Makefile
+
         cd $CFG_BUILD_DIR
     fi
 

branches/snap-stage3/src/librustc/middle/astencode.rs

@@ -681,6 +681,45 @@ impl vtable_decoder_helpers for reader::Decoder {
         @self.read_to_vec(|| self.read_vtable_origin(xcx) )
     }
 
+    #[cfg(stage0)]
+    fn read_vtable_origin(&self, xcx: @ExtendedDecodeContext)
+        -> typeck::vtable_origin {
+        do self.read_enum(~"vtable_origin") {
+            do self.read_enum_variant |i| {
+                match i {
+                  0 => {
+                    typeck::vtable_static(
+                        do self.read_enum_variant_arg(0u) {
+                            self.read_def_id(xcx)
+                        },
+                        do self.read_enum_variant_arg(1u) {
+                            self.read_tys(xcx)
+                        },
+                        do self.read_enum_variant_arg(2u) {
+                            self.read_vtable_res(xcx)
+                        }
+                    )
+                  }
+                  1 => {
+                    typeck::vtable_param(
+                        do self.read_enum_variant_arg(0u) {
+                            self.read_uint()
+                        },
+                        do self.read_enum_variant_arg(1u) {
+                            self.read_uint()
+                        }
+                    )
+                  }
+                  // hard to avoid - user input
+                  _ => fail!(~"bad enum variant")
+                }
+            }
+        }
+    }
+
+    #[cfg(stage1)]
+    #[cfg(stage2)]
+    #[cfg(stage3)]
     fn read_vtable_origin(&self, xcx: @ExtendedDecodeContext)
         -> typeck::vtable_origin {
         do self.read_enum("vtable_origin") {

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

@@ -334,6 +334,19 @@ pub mod reader {
             self.push_doc(self.next_doc(EsEnum), f)
         }
 
+        #[cfg(stage0)]
+        fn read_enum_variant<T>(&self, f: &fn(uint) -> T) -> T {
+            debug!("read_enum_variant()");
+            let idx = self._next_uint(EsEnumVid);
+            debug!("  idx=%u", idx);
+            do self.push_doc(self.next_doc(EsEnumBody)) {
+                f(idx)
+            }
+        }
+
+        #[cfg(stage1)]
+        #[cfg(stage2)]
+        #[cfg(stage3)]
         fn read_enum_variant<T>(&self, _names: &[&str], f: &fn(uint) -> T) -> T {
             debug!("read_enum_variant()");
             let idx = self._next_uint(EsEnumVid);
@@ -397,6 +410,23 @@ pub mod reader {
             f()
         }
 
+        #[cfg(stage0)]
+        fn read_option<T>(&self, f: &fn(bool) -> T) -> T {
+            debug!("read_option()");
+            do self.read_enum("Option") || {
+                do self.read_enum_variant |idx| {
+                    match idx {
+                        0 => f(false),
+                        1 => f(true),
+                        _ => fail!(),
+                    }
+                }
+            }
+        }
+
+        #[cfg(stage1)]
+        #[cfg(stage2)]
+        #[cfg(stage3)]
         fn read_option<T>(&self, f: &fn(bool) -> T) -> T {
             debug!("read_option()");
             do self.read_enum("Option") || {

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

@@ -854,6 +854,19 @@ impl<'self> serialize::Decoder for Decoder<'self> {
         f()
     }
 
+    #[cfg(stage0)]
+    fn read_enum_variant<T>(&self, f: &fn(uint) -> T) -> T {
+        debug!("read_enum_variant()");
+        let idx = match *self.peek() {
+            Null => 0,
+            _ => 1,
+        };
+        f(idx)
+    }
+
+    #[cfg(stage1)]
+    #[cfg(stage2)]
+    #[cfg(stage3)]
     fn read_enum_variant<T>(&self, names: &[&str], f: &fn(uint) -> T) -> T {
         debug!("read_enum_variant(names=%?)", names);
         let name = match *self.peek() {

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

@@ -93,6 +93,12 @@ pub trait Decoder {
     // Compound types:
     fn read_enum<T>(&self, name: &str, f: &fn() -> T) -> T;
 
+    #[cfg(stage0)]
+    fn read_enum_variant<T>(&self, f: &fn(uint) -> T) -> T;
+
+    #[cfg(stage1)]
+    #[cfg(stage2)]
+    #[cfg(stage3)]
     fn read_enum_variant<T>(&self, names: &[&str], f: &fn(uint) -> T) -> T;
 
     fn read_enum_variant_arg<T>(&self, idx: uint, f: &fn() -> T) -> T;

branches/snap-stage3/src/snapshots.txt

@@ -1,11 +1,3 @@
-S 2013-03-28 f7a2371
-  macos-i386 2e05a33716fc4982db53946c3b0dccf0194826fe
-  macos-x86_64 fbd3feec8dd17a6b6c8df114e6e9b4cd17cc6172
-  linux-i386 b89197edd3ba5be7c2ee6577f048d7663640e1d1
-  linux-x86_64 61a4377c6d0ca5814c2b2b752d73b61b741a23c9
-  winnt-i386 858a74afb210b30697227a87b67e44786b383a0c
-  freebsd-x86_64 01f1e4b94504045e763eecb71c7e0852f6e85036
-
 S 2013-03-27 8c15409
   macos-x86_64 05eb3801b60056d95715c891d00c5d372e34d00c
   macos-i386 4119e3fa614fa86adf60ed0183d00db3ce6d0dbc