mirror of
https://github.com/pezkuwichain/serde.git
synced 2026-04-23 23:27:59 +00:00
Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b8c9a66d75 | |||
| 56b2e39dda | |||
| 5bc805329e | |||
| 69dd3215f4 | |||
| a7a7a31809 | |||
| af9996aa9a | |||
| 0d4d47c398 | |||
| 30361ac6d0 |
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "serde"
|
||||
version = "1.0.28" # remember to update html_root_url
|
||||
version = "1.0.31" # remember to update html_root_url
|
||||
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
|
||||
license = "MIT/Apache-2.0"
|
||||
description = "A generic serialization/deserialization framework"
|
||||
|
||||
+1
-1
@@ -79,7 +79,7 @@
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// Serde types in rustdoc of other crates get linked to here.
|
||||
#![doc(html_root_url = "https://docs.rs/serde/1.0.28")]
|
||||
#![doc(html_root_url = "https://docs.rs/serde/1.0.31")]
|
||||
// Support using Serde without the standard library!
|
||||
#![cfg_attr(not(feature = "std"), no_std)]
|
||||
// Unstable functionality only if the user asks for it. For tracking and
|
||||
|
||||
@@ -188,7 +188,7 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
deserializer.deserialize_str(CowBytesVisitor)
|
||||
deserializer.deserialize_bytes(CowBytesVisitor)
|
||||
}
|
||||
|
||||
pub mod size_hint {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "serde_derive"
|
||||
version = "1.0.28" # remember to update html_root_url
|
||||
version = "1.0.31" # remember to update html_root_url
|
||||
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
|
||||
license = "MIT/Apache-2.0"
|
||||
description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"
|
||||
|
||||
+5
-11
@@ -566,16 +566,14 @@ fn deserialize_seq(
|
||||
}
|
||||
});
|
||||
|
||||
// FIXME: parentheses around field values are because of
|
||||
// https://github.com/rust-lang/rust/issues/47311
|
||||
let mut result = if is_struct {
|
||||
let names = fields.iter().map(|f| &f.ident);
|
||||
quote_spanned! {Span::call_site()=>
|
||||
#type_path { #( #names: (#vars) ),* }
|
||||
#type_path { #( #names: #vars ),* }
|
||||
}
|
||||
} else {
|
||||
quote_spanned! {Span::call_site()=>
|
||||
#type_path ( #((#vars)),* )
|
||||
#type_path ( #(#vars),* )
|
||||
}
|
||||
};
|
||||
|
||||
@@ -718,9 +716,7 @@ fn deserialize_newtype_struct(type_path: &Tokens, params: &Parameters, field: &F
|
||||
}
|
||||
};
|
||||
|
||||
// FIXME: parentheses around field values are because of
|
||||
// https://github.com/rust-lang/rust/issues/47311
|
||||
let mut result = quote_spanned!(Span::call_site()=> #type_path((#value)));
|
||||
let mut result = quote_spanned!(Span::call_site()=> #type_path(#value));
|
||||
if params.has_getter {
|
||||
let this = ¶ms.this;
|
||||
result = quote! {
|
||||
@@ -2054,15 +2050,13 @@ fn deserialize_map(
|
||||
}
|
||||
});
|
||||
|
||||
// FIXME: parentheses around field values are because of
|
||||
// https://github.com/rust-lang/rust/issues/47311
|
||||
let result = fields_names.iter().map(|&(field, ref name)| {
|
||||
let ident = field.ident.expect("struct contains unnamed fields");
|
||||
if field.attrs.skip_deserializing() {
|
||||
let value = Expr(expr_is_missing(field, cattrs));
|
||||
quote_spanned!(Span::call_site()=> #ident: (#value))
|
||||
quote_spanned!(Span::call_site()=> #ident: #value)
|
||||
} else {
|
||||
quote_spanned!(Span::call_site()=> #ident: (#name))
|
||||
quote_spanned!(Span::call_site()=> #ident: #name)
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
//!
|
||||
//! [https://serde.rs/derive.html]: https://serde.rs/derive.html
|
||||
|
||||
#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.28")]
|
||||
#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.31")]
|
||||
#![cfg_attr(feature = "cargo-clippy", allow(enum_variant_names, redundant_field_names,
|
||||
too_many_arguments, used_underscore_binding))]
|
||||
// The `quote!` macro requires deep recursion.
|
||||
|
||||
@@ -936,7 +936,7 @@ impl Field {
|
||||
} else if is_rptr(&field.ty, is_str) || is_rptr(&field.ty, is_slice_u8) {
|
||||
// Types &str and &[u8] are always implicitly borrowed. No need for
|
||||
// a #[serde(borrow)].
|
||||
borrowed_lifetimes = borrowable_lifetimes(cx, &ident, &field.ty).unwrap();
|
||||
collect_lifetimes(&field.ty, &mut borrowed_lifetimes);
|
||||
}
|
||||
|
||||
let ser_name = ser_name.get();
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
use std::fmt::Display;
|
||||
use std::cell::RefCell;
|
||||
use std::thread;
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct Ctxt {
|
||||
@@ -48,7 +49,7 @@ impl Ctxt {
|
||||
|
||||
impl Drop for Ctxt {
|
||||
fn drop(&mut self) {
|
||||
if self.errors.borrow().is_some() {
|
||||
if !thread::panicking() && self.errors.borrow().is_some() {
|
||||
panic!("forgot to check for errors");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "serde_test"
|
||||
version = "1.0.28" # remember to update html_root_url
|
||||
version = "1.0.31" # remember to update html_root_url
|
||||
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
|
||||
license = "MIT/Apache-2.0"
|
||||
description = "Token De/Serializer for testing De/Serialize implementations"
|
||||
|
||||
@@ -155,7 +155,7 @@
|
||||
//! # }
|
||||
//! ```
|
||||
|
||||
#![doc(html_root_url = "https://docs.rs/serde_test/1.0.28")]
|
||||
#![doc(html_root_url = "https://docs.rs/serde_test/1.0.31")]
|
||||
#![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
|
||||
// Whitelisted clippy lints
|
||||
#![cfg_attr(feature = "cargo-clippy", allow(float_cmp))]
|
||||
|
||||
@@ -9,10 +9,6 @@
|
||||
#![feature(lang_items, start, compiler_builtins_lib)]
|
||||
#![no_std]
|
||||
|
||||
// https://github.com/rust-lang/rust/issues/47311
|
||||
#![allow(unused_parens)]
|
||||
#![cfg_attr(feature = "cargo-clippy", allow(double_parens))]
|
||||
|
||||
extern crate libc;
|
||||
extern crate compiler_builtins;
|
||||
|
||||
|
||||
@@ -8,10 +8,6 @@
|
||||
|
||||
#![cfg_attr(feature = "cargo-clippy", allow(cast_lossless))]
|
||||
|
||||
// https://github.com/rust-lang/rust/issues/47311
|
||||
#![allow(unused_parens)]
|
||||
#![cfg_attr(feature = "cargo-clippy", allow(double_parens))]
|
||||
|
||||
#[macro_use]
|
||||
extern crate serde_derive;
|
||||
|
||||
|
||||
@@ -6,9 +6,7 @@
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// https://github.com/rust-lang/rust/issues/47311
|
||||
#![allow(unused_parens)]
|
||||
#![cfg_attr(feature = "cargo-clippy", allow(decimal_literal_representation, double_parens))]
|
||||
#![cfg_attr(feature = "cargo-clippy", allow(decimal_literal_representation))]
|
||||
|
||||
#[macro_use]
|
||||
extern crate serde_derive;
|
||||
|
||||
@@ -13,10 +13,6 @@
|
||||
#![deny(warnings)]
|
||||
#![cfg_attr(feature = "unstable", feature(non_ascii_idents))]
|
||||
|
||||
// https://github.com/rust-lang/rust/issues/47311
|
||||
#![allow(unused_parens)]
|
||||
#![cfg_attr(feature = "cargo-clippy", allow(double_parens))]
|
||||
|
||||
#[macro_use]
|
||||
extern crate serde_derive;
|
||||
|
||||
|
||||
@@ -8,9 +8,7 @@
|
||||
|
||||
#![deny(trivial_numeric_casts)]
|
||||
|
||||
// https://github.com/rust-lang/rust/issues/47311
|
||||
#![allow(unused_parens)]
|
||||
#![cfg_attr(feature = "cargo-clippy", allow(double_parens, redundant_field_names))]
|
||||
#![cfg_attr(feature = "cargo-clippy", allow(redundant_field_names))]
|
||||
|
||||
#[macro_use]
|
||||
extern crate serde_derive;
|
||||
|
||||
@@ -6,9 +6,7 @@
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// https://github.com/rust-lang/rust/issues/47311
|
||||
#![allow(unused_parens)]
|
||||
#![cfg_attr(feature = "cargo-clippy", allow(double_parens, redundant_field_names))]
|
||||
#![cfg_attr(feature = "cargo-clippy", allow(redundant_field_names))]
|
||||
|
||||
#[macro_use]
|
||||
extern crate serde_derive;
|
||||
|
||||
Reference in New Issue
Block a user