diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-03-29 17:41:32 -0700 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-03-29 17:41:32 -0700 |
| commit | 529ae386056eefdfad04cab8a32d6e88ebbe0e5e (patch) | |
| tree | 4396879dffede422bc085a8602891449ff6736e1 /src/libstd/json.rs | |
| parent | 356438989830d8b9e597096a9d1ea2c7b6aa9af9 (diff) | |
| parent | a17a9d41f6bf06daacb0aedb0cb2144dc4ba1c53 (diff) | |
| download | rust-529ae386056eefdfad04cab8a32d6e88ebbe0e5e.tar.gz rust-529ae386056eefdfad04cab8a32d6e88ebbe0e5e.zip | |
Merge remote-tracking branch 'remotes/origin/incoming' into serial
Diffstat (limited to 'src/libstd/json.rs')
| -rw-r--r-- | src/libstd/json.rs | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/libstd/json.rs b/src/libstd/json.rs index d26c1606a5e..d12488ed01f 100644 --- a/src/libstd/json.rs +++ b/src/libstd/json.rs @@ -803,19 +803,6 @@ impl serialize::Decoder for Decoder { f() } - #[cfg(stage0)] - fn read_enum_variant<T>(&self, f: &fn(uint) -> T) -> T { - debug!("read_enum_variant()"); - let idx = match self.stack.pop() { - Null => { self.stack.push(Null); 0 }, - value => { self.stack.push(value); 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.stack.pop() { |