From 518c295a03c5422aec26ac067307c32d11a92e66 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Fri, 29 Mar 2013 11:18:35 -0700
Subject: [PATCH] Register snapshots
---
src/librustc/middle/astencode.rs | 39 --------------------------------
src/libstd/ebml.rs | 30 ------------------------
src/libstd/json.rs | 13 -----------
src/libstd/serialize.rs | 6 -----
src/snapshots.txt | 8 +++++++
5 files changed, 8 insertions(+), 88 deletions(-)
diff --git a/src/librustc/middle/astencode.rs b/src/librustc/middle/astencode.rs
index c5018bbe13f..7b7cf01d2b5 100644
--- a/src/librustc/middle/astencode.rs
+++ b/src/librustc/middle/astencode.rs
@@ -681,45 +681,6 @@ 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") {
diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs
index 98c4b3c6b16..484220776c3 100644
--- a/src/libstd/ebml.rs
+++ b/src/libstd/ebml.rs
@@ -334,19 +334,6 @@ 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);
@@ -410,23 +397,6 @@ 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") || {
diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index 4b0e313330d..190d2d3fe0b 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -854,19 +854,6 @@ 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() {
diff --git a/src/libstd/serialize.rs b/src/libstd/serialize.rs
index 3c9ad0d77d1..8e7ab318e17 100644
--- a/src/libstd/serialize.rs
+++ b/src/libstd/serialize.rs
@@ -93,12 +93,6 @@ 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;
diff --git a/src/snapshots.txt b/src/snapshots.txt
index c3f8c8b1e63..fafd5467655 100644
--- a/src/snapshots.txt
+++ b/src/snapshots.txt
@@ -1,3 +1,11 @@
+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