diff --git a/.gitignore b/.gitignore
index b83d2226..e9e21997 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /target/
+/Cargo.lock
diff --git a/src/de.rs b/src/de.rs
index ee5286f0..6c9d22c7 100644
--- a/src/de.rs
+++ b/src/de.rs
@@ -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));
 
diff --git a/src/json/mod.rs b/src/json/mod.rs
index 9647602d..de2a4640 100644
--- a/src/json/mod.rs
+++ b/src/json/mod.rs
@@ -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;
diff --git a/src/ser.rs b/src/ser.rs
index 29ae3d8d..b33b32da 100644
--- a/src/ser.rs
+++ b/src/ser.rs
@@ -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;