librustc: Stop parsing impl Type : Trait and fix several declarations that slipped through. r=tjc
This commit is contained in:
Patrick Walton
parent
566bcf2225
commit
bb833ca0f0
82 changed files with 327 additions and 424 deletions
|
|
@ -113,210 +113,210 @@ pub trait Decodable<D: Decoder> {
|
|||
static fn decode(&self, d: &D) -> Self;
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> uint: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for uint {
|
||||
fn encode(&self, s: &S) { s.emit_uint(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> uint: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for uint {
|
||||
static fn decode(&self, d: &D) -> uint {
|
||||
d.read_uint()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> u8: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for u8 {
|
||||
fn encode(&self, s: &S) { s.emit_u8(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> u8: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for u8 {
|
||||
static fn decode(&self, d: &D) -> u8 {
|
||||
d.read_u8()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> u16: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for u16 {
|
||||
fn encode(&self, s: &S) { s.emit_u16(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> u16: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for u16 {
|
||||
static fn decode(&self, d: &D) -> u16 {
|
||||
d.read_u16()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> u32: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for u32 {
|
||||
fn encode(&self, s: &S) { s.emit_u32(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> u32: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for u32 {
|
||||
static fn decode(&self, d: &D) -> u32 {
|
||||
d.read_u32()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> u64: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for u64 {
|
||||
fn encode(&self, s: &S) { s.emit_u64(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> u64: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for u64 {
|
||||
static fn decode(&self, d: &D) -> u64 {
|
||||
d.read_u64()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> int: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for int {
|
||||
fn encode(&self, s: &S) { s.emit_int(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> int: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for int {
|
||||
static fn decode(&self, d: &D) -> int {
|
||||
d.read_int()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> i8: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for i8 {
|
||||
fn encode(&self, s: &S) { s.emit_i8(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> i8: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for i8 {
|
||||
static fn decode(&self, d: &D) -> i8 {
|
||||
d.read_i8()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> i16: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for i16 {
|
||||
fn encode(&self, s: &S) { s.emit_i16(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> i16: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for i16 {
|
||||
static fn decode(&self, d: &D) -> i16 {
|
||||
d.read_i16()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> i32: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for i32 {
|
||||
fn encode(&self, s: &S) { s.emit_i32(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> i32: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for i32 {
|
||||
static fn decode(&self, d: &D) -> i32 {
|
||||
d.read_i32()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> i64: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for i64 {
|
||||
fn encode(&self, s: &S) { s.emit_i64(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> i64: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for i64 {
|
||||
static fn decode(&self, d: &D) -> i64 {
|
||||
d.read_i64()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> &str: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for &str {
|
||||
fn encode(&self, s: &S) { s.emit_borrowed_str(*self) }
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> ~str: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for ~str {
|
||||
fn encode(&self, s: &S) { s.emit_owned_str(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> ~str: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for ~str {
|
||||
static fn decode(&self, d: &D) -> ~str {
|
||||
d.read_owned_str()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> @str: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for @str {
|
||||
fn encode(&self, s: &S) { s.emit_managed_str(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> @str: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for @str {
|
||||
static fn decode(&self, d: &D) -> @str {
|
||||
d.read_managed_str()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> float: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for float {
|
||||
fn encode(&self, s: &S) { s.emit_float(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> float: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for float {
|
||||
static fn decode(&self, d: &D) -> float {
|
||||
d.read_float()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> f32: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for f32 {
|
||||
fn encode(&self, s: &S) { s.emit_f32(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> f32: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for f32 {
|
||||
static fn decode(&self, d: &D) -> f32 {
|
||||
d.read_f32() }
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> f64: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for f64 {
|
||||
fn encode(&self, s: &S) { s.emit_f64(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> f64: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for f64 {
|
||||
static fn decode(&self, d: &D) -> f64 {
|
||||
d.read_f64()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> bool: Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for bool {
|
||||
fn encode(&self, s: &S) { s.emit_bool(*self) }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> bool: Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for bool {
|
||||
static fn decode(&self, d: &D) -> bool {
|
||||
d.read_bool()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> (): Encodable<S> {
|
||||
pub impl<S: Encoder> Encodable<S> for () {
|
||||
fn encode(&self, s: &S) { s.emit_nil() }
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> (): Decodable<D> {
|
||||
pub impl<D: Decoder> Decodable<D> for () {
|
||||
static fn decode(&self, d: &D) -> () {
|
||||
d.read_nil()
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder, T: Encodable<S>> &T: Encodable<S> {
|
||||
pub impl<S: Encoder, T: Encodable<S>> Encodable<S> for &T {
|
||||
fn encode(&self, s: &S) {
|
||||
s.emit_borrowed(|| (**self).encode(s))
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder, T: Encodable<S>> ~T: Encodable<S> {
|
||||
pub impl<S: Encoder, T: Encodable<S>> Encodable<S> for ~T {
|
||||
fn encode(&self, s: &S) {
|
||||
s.emit_owned(|| (**self).encode(s))
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<D: Decoder, T: Decodable<D>> ~T: Decodable<D> {
|
||||
pub impl<D: Decoder, T: Decodable<D>> Decodable<D> for ~T {
|
||||
static fn decode(&self, d: &D) -> ~T {
|
||||
d.read_owned(|| ~Decodable::decode(d))
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder, T: Encodable<S>> @T: Encodable<S> {
|
||||
pub impl<S: Encoder, T: Encodable<S>> Encodable<S> for @T {
|
||||
fn encode(&self, s: &S) {
|
||||
s.emit_managed(|| (**self).encode(s))
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<D: Decoder, T: Decodable<D>> @T: Decodable<D> {
|
||||
pub impl<D: Decoder, T: Decodable<D>> Decodable<D> for @T {
|
||||
static fn decode(&self, d: &D) -> @T {
|
||||
d.read_managed(|| @Decodable::decode(d))
|
||||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder, T: Encodable<S>> &[T]: Encodable<S> {
|
||||
pub impl<S: Encoder, T: Encodable<S>> Encodable<S> for &[T] {
|
||||
fn encode(&self, s: &S) {
|
||||
do s.emit_borrowed_vec(self.len()) {
|
||||
for self.eachi |i, e| {
|
||||
|
|
@ -326,7 +326,7 @@ pub impl<S: Encoder, T: Encodable<S>> &[T]: Encodable<S> {
|
|||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder, T: Encodable<S>> ~[T]: Encodable<S> {
|
||||
pub impl<S: Encoder, T: Encodable<S>> Encodable<S> for ~[T] {
|
||||
fn encode(&self, s: &S) {
|
||||
do s.emit_owned_vec(self.len()) {
|
||||
for self.eachi |i, e| {
|
||||
|
|
@ -336,7 +336,7 @@ pub impl<S: Encoder, T: Encodable<S>> ~[T]: Encodable<S> {
|
|||
}
|
||||
}
|
||||
|
||||
pub impl<D: Decoder, T: Decodable<D>> ~[T]: Decodable<D> {
|
||||
pub impl<D: Decoder, T: Decodable<D>> Decodable<D> for ~[T] {
|
||||
static fn decode(&self, d: &D) -> ~[T] {
|
||||
do d.read_owned_vec |len| {
|
||||
do vec::from_fn(len) |i| {
|
||||
|
|
@ -346,7 +346,7 @@ pub impl<D: Decoder, T: Decodable<D>> ~[T]: Decodable<D> {
|
|||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder, T: Encodable<S>> @[T]: Encodable<S> {
|
||||
pub impl<S: Encoder, T: Encodable<S>> Encodable<S> for @[T] {
|
||||
fn encode(&self, s: &S) {
|
||||
do s.emit_managed_vec(self.len()) {
|
||||
for self.eachi |i, e| {
|
||||
|
|
@ -356,7 +356,7 @@ pub impl<S: Encoder, T: Encodable<S>> @[T]: Encodable<S> {
|
|||
}
|
||||
}
|
||||
|
||||
pub impl<D: Decoder, T: Decodable<D>> @[T]: Decodable<D> {
|
||||
pub impl<D: Decoder, T: Decodable<D>> Decodable<D> for @[T] {
|
||||
static fn decode(&self, d: &D) -> @[T] {
|
||||
do d.read_managed_vec |len| {
|
||||
do at_vec::from_fn(len) |i| {
|
||||
|
|
@ -366,7 +366,7 @@ pub impl<D: Decoder, T: Decodable<D>> @[T]: Decodable<D> {
|
|||
}
|
||||
}
|
||||
|
||||
pub impl<S: Encoder, T: Encodable<S>> Option<T>: Encodable<S> {
|
||||
pub impl<S: Encoder, T: Encodable<S>> Encodable<S> for Option<T> {
|
||||
fn encode(&self, s: &S) {
|
||||
do s.emit_enum(~"option") {
|
||||
match *self {
|
||||
|
|
@ -381,7 +381,7 @@ pub impl<S: Encoder, T: Encodable<S>> Option<T>: Encodable<S> {
|
|||
}
|
||||
}
|
||||
|
||||
pub impl<D: Decoder, T: Decodable<D>> Option<T>: Decodable<D> {
|
||||
pub impl<D: Decoder, T: Decodable<D>> Decodable<D> for Option<T> {
|
||||
static fn decode(&self, d: &D) -> Option<T> {
|
||||
do d.read_enum(~"option") {
|
||||
do d.read_enum_variant |i| {
|
||||
|
|
@ -396,11 +396,8 @@ pub impl<D: Decoder, T: Decodable<D>> Option<T>: Decodable<D> {
|
|||
}
|
||||
}
|
||||
|
||||
pub impl<
|
||||
S: Encoder,
|
||||
T0: Encodable<S>,
|
||||
T1: Encodable<S>
|
||||
> (T0, T1): Encodable<S> {
|
||||
pub impl<S: Encoder, T0: Encodable<S>, T1: Encodable<S>> Encodable<S>
|
||||
for (T0, T1) {
|
||||
fn encode(&self, s: &S) {
|
||||
match *self {
|
||||
(ref t0, ref t1) => {
|
||||
|
|
@ -413,11 +410,8 @@ pub impl<
|
|||
}
|
||||
}
|
||||
|
||||
pub impl<
|
||||
D: Decoder,
|
||||
T0: Decodable<D>,
|
||||
T1: Decodable<D>
|
||||
> (T0, T1): Decodable<D> {
|
||||
pub impl<D: Decoder, T0: Decodable<D>, T1: Decodable<D>> Decodable<D>
|
||||
for (T0, T1) {
|
||||
static fn decode(&self, d: &D) -> (T0, T1) {
|
||||
do d.read_tup(2) {
|
||||
(
|
||||
|
|
@ -433,7 +427,7 @@ pub impl<
|
|||
T0: Encodable<S>,
|
||||
T1: Encodable<S>,
|
||||
T2: Encodable<S>
|
||||
> (T0, T1, T2): Encodable<S> {
|
||||
> Encodable<S> for (T0, T1, T2) {
|
||||
fn encode(&self, s: &S) {
|
||||
match *self {
|
||||
(ref t0, ref t1, ref t2) => {
|
||||
|
|
@ -452,7 +446,7 @@ pub impl<
|
|||
T0: Decodable<D>,
|
||||
T1: Decodable<D>,
|
||||
T2: Decodable<D>
|
||||
> (T0, T1, T2): Decodable<D> {
|
||||
> Decodable<D> for (T0, T1, T2) {
|
||||
static fn decode(&self, d: &D) -> (T0, T1, T2) {
|
||||
do d.read_tup(3) {
|
||||
(
|
||||
|
|
@ -470,7 +464,7 @@ pub impl<
|
|||
T1: Encodable<S>,
|
||||
T2: Encodable<S>,
|
||||
T3: Encodable<S>
|
||||
> (T0, T1, T2, T3): Encodable<S> {
|
||||
> Encodable<S> for (T0, T1, T2, T3) {
|
||||
fn encode(&self, s: &S) {
|
||||
match *self {
|
||||
(ref t0, ref t1, ref t2, ref t3) => {
|
||||
|
|
@ -491,7 +485,7 @@ pub impl<
|
|||
T1: Decodable<D>,
|
||||
T2: Decodable<D>,
|
||||
T3: Decodable<D>
|
||||
> (T0, T1, T2, T3): Decodable<D> {
|
||||
> Decodable<D> for (T0, T1, T2, T3) {
|
||||
static fn decode(&self, d: &D) -> (T0, T1, T2, T3) {
|
||||
do d.read_tup(4) {
|
||||
(
|
||||
|
|
@ -511,7 +505,7 @@ pub impl<
|
|||
T2: Encodable<S>,
|
||||
T3: Encodable<S>,
|
||||
T4: Encodable<S>
|
||||
> (T0, T1, T2, T3, T4): Encodable<S> {
|
||||
> Encodable<S> for (T0, T1, T2, T3, T4) {
|
||||
fn encode(&self, s: &S) {
|
||||
match *self {
|
||||
(ref t0, ref t1, ref t2, ref t3, ref t4) => {
|
||||
|
|
@ -534,7 +528,7 @@ pub impl<
|
|||
T2: Decodable<D>,
|
||||
T3: Decodable<D>,
|
||||
T4: Decodable<D>
|
||||
> (T0, T1, T2, T3, T4): Decodable<D> {
|
||||
> Decodable<D> for (T0, T1, T2, T3, T4) {
|
||||
static fn decode(&self, d: &D)
|
||||
-> (T0, T1, T2, T3, T4) {
|
||||
do d.read_tup(5) {
|
||||
|
|
@ -558,7 +552,7 @@ pub trait EncoderHelpers {
|
|||
fn emit_from_vec<T>(&self, v: &[T], f: fn(v: &T));
|
||||
}
|
||||
|
||||
pub impl<S: Encoder> S: EncoderHelpers {
|
||||
pub impl<S: Encoder> EncoderHelpers for S {
|
||||
fn emit_from_vec<T>(&self, v: &[T], f: fn(v: &T)) {
|
||||
do self.emit_owned_vec(v.len()) {
|
||||
for v.eachi |i, e| {
|
||||
|
|
@ -574,7 +568,7 @@ pub trait DecoderHelpers {
|
|||
fn read_to_vec<T>(&self, f: fn() -> T) -> ~[T];
|
||||
}
|
||||
|
||||
pub impl<D: Decoder> D: DecoderHelpers {
|
||||
pub impl<D: Decoder> DecoderHelpers for D {
|
||||
fn read_to_vec<T>(&self, f: fn() -> T) -> ~[T] {
|
||||
do self.read_owned_vec |len| {
|
||||
do vec::from_fn(len) |i| {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue