bjoernager/rust
bjoernager/rust
1
Fork 0
Code 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

17
src/libsyntax/parse/token.rs
View file

@ -684,29 +684,12 @@ impl<'a> PartialEq<InternedString > for &'a str {
}
}
#[cfg(stage0)]
impl<D:Decoder<E>, E> Decodable<D, E> for InternedString {
fn decode(d: &mut D) -> Result<InternedString, E> {
Ok(get_name(get_ident_interner().intern(
try!(d.read_str()).index(&FullRange))))
}
}
#[cfg(not(stage0))]
impl Decodable for InternedString {
fn decode<D: Decoder>(d: &mut D) -> Result<InternedString, D::Error> {
Ok(get_name(get_ident_interner().intern(try!(d.read_str()).index(&FullRange))))
}
}
#[cfg(stage0)]
impl<S:Encoder<E>, E> Encodable<S, E> for InternedString {
fn encode(&self, s: &mut S) -> Result<(), E> {
s.emit_str(self.string.index(&FullRange))
}
}
#[cfg(not(stage0))]
impl Encodable for InternedString {
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
s.emit_str(self.string.index(&FullRange))