bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Register new snapshots

Browse source 
Conflicts:
	src/librbml/lib.rs
	src/libserialize/json_stage0.rs
	src/libserialize/serialize_stage0.rs
	src/libsyntax/ast.rs
	src/libsyntax/ext/deriving/generic/mod.rs
	src/libsyntax/parse/token.rs
This commit is contained in:
Alex Crichton 2015-01-06 09:24:46 -08:00
parent 5c3ddcb15d
commit e2f97f51ad
59 changed files with 94 additions and 6419 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libsyntax/ast.rs
View file

@ -195,28 +195,12 @@ impl Name {
/// A mark represents a unique id associated with a macro expansion
pub type Mrk = u32;
#[cfg(stage0)]
impl<S: Encoder<E>, E> Encodable<S, E> for Ident {
fn encode(&self, s: &mut S) -> Result<(), E> {
s.emit_str(token::get_ident(*self).get())
}
}
#[cfg(not(stage0))]
impl Encodable for Ident {
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_str(token::get_ident(*self).get())
}
}
#[cfg(stage0)]
impl<D: Decoder<E>, E> Decodable<D, E> for Ident {
fn decode(d: &mut D) -> Result<Ident, E> {
Ok(str_to_ident(try!(d.read_str()).index(&FullRange)))
}
}
#[cfg(not(stage0))]
impl Decodable for Ident {
fn decode<D: Decoder>(d: &mut D) -> Result<Ident, D::Error> {
Ok(str_to_ident(try!(d.read_str()).index(&FullRange)))