From f2836945830a6265dd3baed42c9136b98c9bd288 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Sun, 14 Sep 2014 12:20:12 -0700 Subject: [PATCH] cleanup dead code --- serde2/src/de2.rs | 325 ---------------------------------------------- 1 file changed, 325 deletions(-) diff --git a/serde2/src/de2.rs b/serde2/src/de2.rs index 287b654e..a7bb0543 100644 --- a/serde2/src/de2.rs +++ b/serde2/src/de2.rs @@ -18,32 +18,6 @@ trait VisitorState { SeqState, MapState, >(&mut self, visitor: &mut V) -> Result; - - /* - fn visit_null(&mut self) -> Result<(), E>; - - fn visit_int(&mut self) -> Result; - - fn visit_string(&mut self) -> Result; - - fn visit_seq(&mut self) -> Result; - - fn visit_seq_elt< - T: Deserialize, - >(&mut self) -> Option>; - - /* - fn visit_map< - T: Deserialize, - V: Visitor - >(&mut self) -> Result; - - fn visit_map_elt< - K: Deserialize, - V: Deserialize - >(&mut self) -> Result<(K, V), E>; - */ - */ } trait Visitor< @@ -90,26 +64,6 @@ trait Visitor< } } -/* -trait Visitor, E> { - fn next< - T: Deserialize, - >(&mut self) -> Option>; - - fn size_hint(&self) -> (uint, Option); -} -*/ - -/* -trait Visitor { - fn new(len: uint) -> Self; - - fn visit(&mut self, state: &mut S) -> Result<(), E>; - - fn unwrap(self) -> Result; -} -*/ - /////////////////////////////////////////////////////////////////////////////// impl< @@ -129,8 +83,6 @@ impl< } state.visit(&mut Visitor) - - //state.visit_int() } } @@ -151,8 +103,6 @@ impl< } state.visit(&mut Visitor) - - //state.visit_string() } } @@ -187,21 +137,6 @@ impl< } state.visit(&mut Visitor) - - /* - let len = try!(state.visit_seq()); - let mut value = Vec::with_capacity(len); - - loop { - match state.visit_seq_elt() { - Some(Ok(v)) => { value.push(v); } - Some(Err(err)) => { return Err(err); } - None => { break; } - } - } - - Ok(value) - */ } } @@ -225,8 +160,6 @@ impl< } state.visit(&mut Visitor) - - //state.visit_null() } } @@ -277,120 +210,9 @@ impl< _ => Err(state.syntax_error()), } } - - /* - match self.state { - 0 => { - self.state += 1; - self.t0 = Some(try!(state.visit_seq_elt())); - } - 1 => { - self.state += 1; - self.t1 = Some(try!(state.visit_seq_elt())); - } - _ => fail!() - } - - Ok(()) - } - - fn unwrap(self) -> Result<(T0, T1), E> { - let t0 = match self.t0 { - Some(t0) => t0, - None => { fail!(); } - }; - - let t1 = match self.t1 { - Some(t1) => t1, - None => { fail!(); } - }; - - Ok((t0, t1)) - } - */ } state.visit(&mut Visitor { state: 0 }) - - - /* - let _ = try!(state.visit_seq()); - - let t0 = match state.visit_seq_elt() { - Some(Ok(v)) => v, - Some(Err(err)) => { return Err(err); } - None => { fail!(); } - }; - - let t1 = match state.visit_seq_elt() { - Some(Ok(v)) => v, - Some(Err(err)) => { return Err(err); } - None => { fail!(); } - }; - - match state.visit_seq_elt() { - Some(Ok(())) => { fail!(); } - Some(Err(err)) => { return Err(err); } - None => { } - } - - Ok((t0, t1)) - */ - - /* - struct Visitor { - state: uint, - t0: Option, - t1: Option, - } - - impl< - T0: Deserialize, - T1: Deserialize, - S: VisitorState, - E - > ::Visitor<(T0, T1), S, E> for Visitor { - fn new(_: uint) -> Visitor { - Visitor { - state: 0, - t0: None, - t1: None, - } - } - - fn visit(&mut self, state: &mut S) -> Result<(), E> { - match self.state { - 0 => { - self.state += 1; - self.t0 = Some(try!(state.visit_seq_elt())); - } - 1 => { - self.state += 1; - self.t1 = Some(try!(state.visit_seq_elt())); - } - _ => fail!() - } - - Ok(()) - } - - fn unwrap(self) -> Result<(T0, T1), E> { - let t0 = match self.t0 { - Some(t0) => t0, - None => { fail!(); } - }; - - let t1 = match self.t1 { - Some(t1) => t1, - None => { fail!(); } - }; - - Ok((t0, t1)) - } - } - - state.visit_seq::<(T0, T1), Visitor>() - */ } } @@ -428,38 +250,6 @@ impl< } state.visit(&mut Visitor) - - - /* - struct Visitor { - value: HashMap, - } - - impl< - K: Deserialize + Eq + Hash, - V: Deserialize, - S: VisitorState, - E - > ::Visitor, S, E> for Visitor { - fn new(len: uint) -> Visitor { - Visitor { - value: HashMap::with_capacity(len), - } - } - - fn visit(&mut self, state: &mut S) -> Result<(), E> { - let (key, value) = try!(state.visit_map_elt()); - self.value.insert(key, value); - Ok(()) - } - - fn unwrap(self) -> Result, E> { - Ok(self.value) - } - } - - state.visit_map::, Visitor>() - */ } } @@ -495,38 +285,6 @@ impl< } state.visit(&mut Visitor) - - - /* - struct Visitor { - value: HashMap, - } - - impl< - K: Deserialize + Eq + Hash, - V: Deserialize, - S: VisitorState, - E - > ::Visitor, S, E> for Visitor { - fn new(len: uint) -> Visitor { - Visitor { - value: HashMap::with_capacity(len), - } - } - - fn visit(&mut self, state: &mut S) -> Result<(), E> { - let (key, value) = try!(state.visit_map_elt()); - self.value.insert(key, value); - Ok(()) - } - - fn unwrap(self) -> Result, E> { - Ok(self.value) - } - } - - state.visit_map::, Visitor>() - */ } } @@ -730,89 +488,6 @@ impl< } } - - /* - fn visit_null(&mut self) -> Result<(), ()> { - match self.next() { - Some(Null) => Ok(()), - _ => Err(()) - } - } - - fn visit_int(&mut self) -> Result { - match self.next() { - Some(Int(v)) => Ok(v), - _ => Err(()) - } - } - - fn visit_string(&mut self) -> Result { - match self.next() { - Some(String(v)) => Ok(v), - _ => Err(()) - } - } - - fn visit_seq(&mut self) -> Result { - match self.next() { - Some(SeqStart(len)) => Ok(len), - _ => Err(()), - } - } - - fn visit_seq_elt< - T: Deserialize, ()>, - >(&mut self) -> Option> { - match self.peek() { - Some(&End) => { - self.next(); - None - } - Some(_) => { - Some(Deserialize::deserialize(self)) - } - None => { - Some(Err(())) - } - } - } - - /* - fn visit_map< - T: Deserialize, ()>, - V: Visitor, ()> - >(&mut self) -> Result { - let len = match self.next() { - Some(MapStart(len)) => len, - _ => { return Err(()); } - }; - - let mut visitor: V = Visitor::new(len); - - loop { - match self.next() { - Some(End) => { break; } - Some(token) => { - self.peeked = Some(token); - try!(visitor.visit(self)); - } - _ => { return Err(()); } - } - } - - visitor.unwrap() - } - - fn visit_map_elt< - K: Deserialize, ()>, - V: Deserialize, ()> - >(&mut self) -> Result<(K, V), ()> { - let k = try!(Deserialize::deserialize(self)); - let v = try!(Deserialize::deserialize(self)); - Ok((k, v)) - } - */ - */ } ///////////////////////////////////////////////////////////////////////////////