bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge remote-tracking branch 'remotes/origin/incoming' into serial

Browse source
This commit is contained in:
Erick Tryzelaar 2013-03-29 17:41:32 -07:00
commit 529ae38605
8 changed files with 88 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libstd/json.rs
View file

@ -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() {