mirror of
https://github.com/pezkuwichain/serde.git
synced 2026-06-12 07:21:03 +00:00
Updated non_snake_case and struct lifetimes for the latest Rust
This commit is contained in:
@@ -1 +1,2 @@
|
|||||||
/target/
|
/target/
|
||||||
|
/Cargo.lock
|
||||||
|
|||||||
@@ -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,
|
d: &'a mut D,
|
||||||
len: uint,
|
len: uint,
|
||||||
err: Option<E>,
|
err: Option<E>,
|
||||||
@@ -541,7 +541,7 @@ impl<
|
|||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
struct MapDeserializer<'a, D, E> {
|
struct MapDeserializer<'a, D:'a, E> {
|
||||||
d: &'a mut D,
|
d: &'a mut D,
|
||||||
len: uint,
|
len: uint,
|
||||||
err: Option<E>,
|
err: Option<E>,
|
||||||
@@ -760,7 +760,7 @@ macro_rules! impl_deserialize_tuple {
|
|||||||
$($name: Deserializable<D, E>),*
|
$($name: Deserializable<D, E>),*
|
||||||
> Deserializable<D, E> for ($($name,)*) {
|
> Deserializable<D, E> for ($($name,)*) {
|
||||||
#[inline]
|
#[inline]
|
||||||
#[allow(uppercase_variables)]
|
#[allow(non_snake_case)]
|
||||||
fn deserialize_token(d: &mut D, token: Token) -> Result<($($name,)*), E> {
|
fn deserialize_token(d: &mut D, token: Token) -> Result<($($name,)*), E> {
|
||||||
try!(d.expect_tuple_start(token));
|
try!(d.expect_tuple_start(token));
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -2255,7 +2255,7 @@ macro_rules! impl_to_json_tuple {
|
|||||||
( $($name:ident,)+ ) => {
|
( $($name:ident,)+ ) => {
|
||||||
impl<$($name: ToJson),*> ToJson for ($($name,)*) {
|
impl<$($name: ToJson),*> ToJson for ($($name,)*) {
|
||||||
#[inline]
|
#[inline]
|
||||||
#[allow(uppercase_variables)]
|
#[allow(non_snake_case)]
|
||||||
fn to_json(&self) -> Json {
|
fn to_json(&self) -> Json {
|
||||||
// FIXME: how can we count macro args?
|
// FIXME: how can we count macro args?
|
||||||
let mut len = 0;
|
let mut len = 0;
|
||||||
|
|||||||
+1
-1
@@ -294,7 +294,7 @@ macro_rules! impl_serialize_tuple {
|
|||||||
$($name:Serializable<S, E>),+
|
$($name:Serializable<S, E>),+
|
||||||
> Serializable<S, E> for ($($name,)+) {
|
> Serializable<S, E> for ($($name,)+) {
|
||||||
#[inline]
|
#[inline]
|
||||||
#[allow(uppercase_variables)]
|
#[allow(non_snake_case)]
|
||||||
fn serialize(&self, s: &mut S) -> Result<(), E> {
|
fn serialize(&self, s: &mut S) -> Result<(), E> {
|
||||||
// FIXME: how can we count macro args?
|
// FIXME: how can we count macro args?
|
||||||
let mut len = 0;
|
let mut len = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user