Updated non_snake_case and struct lifetimes for the latest Rust

This commit is contained in:
kvark 2014-09-04 21:57:13 -04:00
parent 3a5424b13c
commit 6b62229dae
4 changed files with 6 additions and 5 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/target/
/Cargo.lock

View File

@ -510,7 +510,7 @@ pub trait Deserializer<E>: Iterator<Result<Token, E>> {
//////////////////////////////////////////////////////////////////////////////
struct SeqDeserializer<'a, D, E> {
struct SeqDeserializer<'a, D: 'a, E> {
d: &'a mut D,
len: uint,
err: Option<E>,
@ -541,7 +541,7 @@ impl<
//////////////////////////////////////////////////////////////////////////////
struct MapDeserializer<'a, D, E> {
struct MapDeserializer<'a, D:'a, E> {
d: &'a mut D,
len: uint,
err: Option<E>,
@ -760,7 +760,7 @@ macro_rules! impl_deserialize_tuple {
$($name: Deserializable<D, E>),*
> Deserializable<D, E> for ($($name,)*) {
#[inline]
#[allow(uppercase_variables)]
#[allow(non_snake_case)]
fn deserialize_token(d: &mut D, token: Token) -> Result<($($name,)*), E> {
try!(d.expect_tuple_start(token));

View File

@ -2255,7 +2255,7 @@ macro_rules! impl_to_json_tuple {
( $($name:ident,)+ ) => {
impl<$($name: ToJson),*> ToJson for ($($name,)*) {
#[inline]
#[allow(uppercase_variables)]
#[allow(non_snake_case)]
fn to_json(&self) -> Json {
// FIXME: how can we count macro args?
let mut len = 0;

View File

@ -294,7 +294,7 @@ macro_rules! impl_serialize_tuple {
$($name:Serializable<S, E>),+
> Serializable<S, E> for ($($name,)+) {
#[inline]
#[allow(uppercase_variables)]
#[allow(non_snake_case)]
fn serialize(&self, s: &mut S) -> Result<(), E> {
// FIXME: how can we count macro args?
let mut len = 0;