use rust 2018 syntax, remove unused headers

This commit is contained in:
Marc-Antoine Arnaud 2020-04-06 14:04:12 +02:00
parent 7de831f27c
commit a93d70831f
24 changed files with 19 additions and 60 deletions

View File

@ -9,6 +9,7 @@ repository = "https://github.com/media-io/yaserde"
homepage = "https://github.com/media-io/yaserde" homepage = "https://github.com/media-io/yaserde"
documentation = "https://docs.rs/yaserde" documentation = "https://docs.rs/yaserde"
readme = "../README.md" readme = "../README.md"
edition = "2018"
[dependencies] [dependencies]
yaserde_derive = { version = "0.3.11", path = "../yaserde_derive", optional = true } yaserde_derive = { version = "0.3.11", path = "../yaserde_derive", optional = true }

View File

@ -1,10 +1,10 @@
//! Generic data structure deserialization framework. //! Generic data structure deserialization framework.
//! //!
use crate::YaDeserialize;
use std::io::Read; use std::io::Read;
use xml::name::OwnedName; use xml::name::OwnedName;
use xml::reader::{EventReader, ParserConfig, XmlEvent}; use xml::reader::{EventReader, ParserConfig, XmlEvent};
use YaDeserialize;
pub fn from_str<T: YaDeserialize>(s: &str) -> Result<T, String> { pub fn from_str<T: YaDeserialize>(s: &str) -> Result<T, String> {
from_reader(s.as_bytes()) from_reader(s.as_bytes())

View File

@ -5,7 +5,7 @@
#[macro_use] #[macro_use]
extern crate log; extern crate log;
extern crate xml;
#[cfg(feature = "yaserde_derive")] #[cfg(feature = "yaserde_derive")]
#[allow(unused_imports)] #[allow(unused_imports)]
#[macro_use] #[macro_use]

View File

@ -1,12 +1,12 @@
//! Generic data structure serialization framework. //! Generic data structure serialization framework.
//! //!
use crate::YaSerialize;
use std::io::{Cursor, Write}; use std::io::{Cursor, Write};
use std::str; use std::str;
use xml; use xml;
use xml::writer::XmlEvent; use xml::writer::XmlEvent;
use xml::{EmitterConfig, EventWriter}; use xml::{EmitterConfig, EventWriter};
use YaSerialize;
pub fn to_string<T: YaSerialize>(model: &T) -> Result<String, String> { pub fn to_string<T: YaSerialize>(model: &T) -> Result<String, String> {
let buf = Cursor::new(Vec::new()); let buf = Cursor::new(Vec::new());

View File

@ -1,8 +1,4 @@
#[macro_use] #[macro_use]
extern crate log;
extern crate xml;
extern crate yaserde;
#[macro_use]
extern crate yaserde_derive; extern crate yaserde_derive;
use std::io::Read; use std::io::Read;

View File

@ -1,8 +1,4 @@
#[macro_use] #[macro_use]
extern crate log;
extern crate xml;
extern crate yaserde;
#[macro_use]
extern crate yaserde_derive; extern crate yaserde_derive;
use std::io::Read; use std::io::Read;

View File

@ -1,8 +1,4 @@
#[macro_use] #[macro_use]
extern crate log;
extern crate xml;
extern crate yaserde;
#[macro_use]
extern crate yaserde_derive; extern crate yaserde_derive;
use std::io::Read; use std::io::Read;

View File

@ -1,8 +1,4 @@
#[macro_use] #[macro_use]
extern crate log;
extern crate xml;
extern crate yaserde;
#[macro_use]
extern crate yaserde_derive; extern crate yaserde_derive;
use std::io::Read; use std::io::Read;

View File

@ -1,8 +1,4 @@
#[macro_use] #[macro_use]
extern crate log;
extern crate xml;
extern crate yaserde;
#[macro_use]
extern crate yaserde_derive; extern crate yaserde_derive;
use std::io::Read; use std::io::Read;

View File

@ -1,8 +1,4 @@
#[macro_use] #[macro_use]
extern crate log;
extern crate xml;
extern crate yaserde;
#[macro_use]
extern crate yaserde_derive; extern crate yaserde_derive;
use std::io::Read; use std::io::Read;

View File

@ -1,6 +1,3 @@
extern crate log;
extern crate xml;
extern crate yaserde;
#[macro_use] #[macro_use]
extern crate yaserde_derive; extern crate yaserde_derive;

View File

@ -1,6 +1,3 @@
extern crate log;
extern crate xml;
extern crate yaserde;
#[macro_use] #[macro_use]
extern crate yaserde_derive; extern crate yaserde_derive;
@ -193,7 +190,7 @@ fn ser_struct_default_namespace_via_attribute_with_prefix() {
namespace = "ttm: http://www.w3.org/ns/ttml#metadata" namespace = "ttm: http://www.w3.org/ns/ttml#metadata"
)] )]
pub struct XmlStruct { pub struct XmlStruct {
#[yaserde(prefix="TTML")] #[yaserde(prefix = "TTML")]
item: String, item: String,
} }

View File

@ -1,6 +1,3 @@
extern crate log;
extern crate xml;
extern crate yaserde;
#[macro_use] #[macro_use]
extern crate yaserde_derive; extern crate yaserde_derive;

View File

@ -1,6 +1,3 @@
extern crate log;
extern crate xml;
extern crate yaserde;
#[macro_use] #[macro_use]
extern crate yaserde_derive; extern crate yaserde_derive;

View File

@ -1,6 +1,3 @@
extern crate log;
extern crate xml;
extern crate yaserde;
#[macro_use] #[macro_use]
extern crate yaserde_derive; extern crate yaserde_derive;

View File

@ -1,6 +1,3 @@
extern crate log;
extern crate xml;
extern crate yaserde;
#[macro_use] #[macro_use]
extern crate yaserde_derive; extern crate yaserde_derive;

View File

@ -9,6 +9,7 @@ repository = "https://github.com/media-io/yaserde"
homepage = "https://github.com/media-io/yaserde" homepage = "https://github.com/media-io/yaserde"
documentation = "https://docs.rs/yaserde" documentation = "https://docs.rs/yaserde"
readme = "../README.md" readme = "../README.md"
edition = "2018"
[dependencies] [dependencies]
syn = { version = "~1.0", features = ["visit", "extra-traits"] } syn = { version = "~1.0", features = ["visit", "extra-traits"] }

View File

@ -1,5 +1,5 @@
use attribute::*; use crate::attribute::*;
use field_type::*; use crate::field_type::*;
use proc_macro2::TokenStream; use proc_macro2::TokenStream;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use syn::spanned::Spanned; use syn::spanned::Spanned;

View File

@ -1,6 +1,6 @@
use attribute::*; use crate::attribute::*;
use de::build_default_value::build_default_value; use crate::de::build_default_value::build_default_value;
use field_type::*; use crate::field_type::*;
use proc_macro2::{Span, TokenStream}; use proc_macro2::{Span, TokenStream};
use std::collections::BTreeMap; use std::collections::BTreeMap;
use syn::spanned::Spanned; use syn::spanned::Spanned;

View File

@ -2,7 +2,7 @@ pub mod build_default_value;
pub mod expand_enum; pub mod expand_enum;
pub mod expand_struct; pub mod expand_struct;
use attribute; use crate::attribute;
use proc_macro2::TokenStream; use proc_macro2::TokenStream;
use syn; use syn;
use syn::Ident; use syn::Ident;

View File

@ -1,4 +1,4 @@
use attribute::*; use crate::attribute::*;
use proc_macro2::{Ident, Span, TokenStream}; use proc_macro2::{Ident, Span, TokenStream};
pub fn enclose_formatted_characters(label: &Ident, label_name: String) -> TokenStream { pub fn enclose_formatted_characters(label: &Ident, label_name: String) -> TokenStream {

View File

@ -1,5 +1,5 @@
use attribute::*; use crate::attribute::*;
use field_type::*; use crate::field_type::*;
use proc_macro2::TokenStream; use proc_macro2::TokenStream;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use syn::spanned::Spanned; use syn::spanned::Spanned;

View File

@ -1,5 +1,6 @@
use attribute::*; use crate::attribute::*;
use field_type::*; use crate::field_type::*;
use crate::ser::element::*;
use proc_macro2::TokenStream; use proc_macro2::TokenStream;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::string::ToString; use std::string::ToString;
@ -7,8 +8,6 @@ use syn::spanned::Spanned;
use syn::DataStruct; use syn::DataStruct;
use syn::Ident; use syn::Ident;
use ser::element::*;
pub fn serialize( pub fn serialize(
data_struct: &DataStruct, data_struct: &DataStruct,
name: &Ident, name: &Ident,

View File

@ -2,7 +2,7 @@ pub mod element;
pub mod expand_enum; pub mod expand_enum;
pub mod expand_struct; pub mod expand_struct;
use attribute; use crate::attribute;
use proc_macro2::TokenStream; use proc_macro2::TokenStream;
use syn; use syn;
use syn::Ident; use syn::Ident;