From 6c83de0e036762068012e8e64d0d9357899e8935 Mon Sep 17 00:00:00 2001 From: Matt Bilker Date: Tue, 18 Dec 2018 17:19:21 +0000 Subject: [PATCH] cargo: version 0.17.0 with Rust 2018 edition --- Cargo.toml | 3 ++- src/byte_buffer.rs | 6 ++--- src/compression.rs | 2 +- src/de/collection.rs | 16 ++++++------- src/de/custom.rs | 2 +- src/de/definition.rs | 12 +++++----- src/de/mod.rs | 6 ++--- src/de/node_contents.rs | 8 +++---- src/de/seq.rs | 10 ++++----- src/de/structure.rs | 12 +++++----- src/encoding_type.rs | 2 +- src/error.rs | 4 ++-- src/lib.rs | 36 +++++++++++++++--------------- src/node/collection.rs | 8 +++---- src/node/de.rs | 18 +++++++-------- src/node/definition.rs | 14 ++++++------ src/node/extra/de.rs | 14 ++++++------ src/node/extra/mod.rs | 2 +- src/node/extra/ser.rs | 2 +- src/node/marshal.rs | 8 +++---- src/node/mod.rs | 2 +- src/node/ser.rs | 2 +- src/options.rs | 4 ++-- src/printer.rs | 8 +++---- src/reader.rs | 14 ++++++------ src/ser/buffer.rs | 4 ++-- src/ser/custom.rs | 6 ++--- src/ser/map.rs | 8 +++---- src/ser/mod.rs | 10 ++++----- src/ser/seq.rs | 6 ++--- src/ser/structure.rs | 6 ++--- src/ser/tuple.rs | 8 +++---- src/sixbit.rs | 2 +- src/text_reader.rs | 10 ++++----- src/to_element/node.rs | 6 ++--- src/to_text_xml/mod.rs | 4 ++-- src/to_text_xml/node.rs | 12 +++++----- src/to_text_xml/node_collection.rs | 10 ++++----- src/value/de.rs | 8 +++---- src/value/mod.rs | 8 +++---- src/value/ser.rs | 2 +- src/writer.rs | 16 ++++++------- 42 files changed, 171 insertions(+), 170 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8e745b0..1d2122f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,8 @@ [package] name = "kbinxml" -version = "0.16.0" +version = "0.17.0" authors = ["Matt Bilker "] +edition = "2018" [dependencies] byteorder = "1.2.3" diff --git a/src/byte_buffer.rs b/src/byte_buffer.rs index bd6e356..aab6fbe 100644 --- a/src/byte_buffer.rs +++ b/src/byte_buffer.rs @@ -6,10 +6,10 @@ use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt}; use bytes::Bytes; use failure::ResultExt; -use node_types::KbinType; +use crate::node_types::KbinType; -pub use encoding_type::EncodingType; -pub use error::{KbinError, KbinErrorKind, Result}; +pub use crate::encoding_type::EncodingType; +pub use crate::error::{KbinError, KbinErrorKind, Result}; /// Remove trailing null bytes, used for the `String` type pub(crate) fn strip_trailing_null_bytes<'a>(data: &'a [u8]) -> &'a [u8] { diff --git a/src/compression.rs b/src/compression.rs index 65cd9f8..cb47b22 100644 --- a/src/compression.rs +++ b/src/compression.rs @@ -1,4 +1,4 @@ -use error::{KbinError, KbinErrorKind}; +use crate::error::{KbinError, KbinErrorKind}; use super::{SIG_COMPRESSED, SIG_UNCOMPRESSED}; #[derive(Clone, Copy, Debug, PartialEq, Eq)] diff --git a/src/de/collection.rs b/src/de/collection.rs index c59dd88..80a033b 100644 --- a/src/de/collection.rs +++ b/src/de/collection.rs @@ -1,13 +1,13 @@ use serde::de::{self, IntoDeserializer, Visitor}; -use de::custom::Custom; -use de::definition::NodeDefinitionDeserializer; -use de::node_contents::NodeContents; -use de::seq::Seq; -use de::structure::Struct; -use error::{Error, KbinErrorKind}; -use node::{Marshal, NodeCollection}; -use node_types::StandardType; +use crate::de::custom::Custom; +use crate::de::definition::NodeDefinitionDeserializer; +use crate::de::node_contents::NodeContents; +use crate::de::seq::Seq; +use crate::de::structure::Struct; +use crate::error::{Error, KbinErrorKind}; +use crate::node::{Marshal, NodeCollection}; +use crate::node_types::StandardType; fn warn_attributes(value: &NodeCollection) -> Result<(), Error> { for attr in value.attributes() { diff --git a/src/de/custom.rs b/src/de/custom.rs index e5a7900..26cd079 100644 --- a/src/de/custom.rs +++ b/src/de/custom.rs @@ -1,6 +1,6 @@ use serde::de::{Deserializer, DeserializeSeed, EnumAccess, Error, IntoDeserializer, VariantAccess, Visitor}; -use node_types::StandardType; +use crate::node_types::StandardType; pub struct Custom { de: D, diff --git a/src/de/definition.rs b/src/de/definition.rs index ffbbd6c..1163b2c 100644 --- a/src/de/definition.rs +++ b/src/de/definition.rs @@ -1,11 +1,11 @@ use serde::de::{self, IntoDeserializer, Visitor}; -use de::custom::Custom; -use de::seq::Seq; -use error::{Error, KbinErrorKind}; -use node::{Marshal, NodeCollection, NodeDefinition}; -use node_types::StandardType; -use value::Value; +use crate::de::custom::Custom; +use crate::de::seq::Seq; +use crate::error::{Error, KbinErrorKind}; +use crate::node::{Marshal, NodeCollection, NodeDefinition}; +use crate::node_types::StandardType; +use crate::value::Value; pub struct NodeDefinitionDeserializer<'a> { definition: &'a NodeDefinition, diff --git a/src/de/mod.rs b/src/de/mod.rs index bc6acff..bc53046 100644 --- a/src/de/mod.rs +++ b/src/de/mod.rs @@ -3,9 +3,9 @@ use std::result::Result as StdResult; use bytes::Bytes; use serde::de::{self, Deserialize, Visitor}; -use error::{Error, KbinErrorKind}; -use node::NodeCollection; -use reader::Reader; +use crate::error::{Error, KbinErrorKind}; +use crate::node::NodeCollection; +use crate::reader::Reader; mod collection; mod custom; diff --git a/src/de/node_contents.rs b/src/de/node_contents.rs index 3079e83..65f7616 100644 --- a/src/de/node_contents.rs +++ b/src/de/node_contents.rs @@ -1,9 +1,9 @@ use serde::de::{DeserializeSeed, IntoDeserializer, MapAccess}; -use de::{Custom, Result}; -use de::definition::NodeDefinitionDeserializer; -use error::{Error, KbinErrorKind}; -use node::NodeCollection; +use crate::de::{Custom, Result}; +use crate::de::definition::NodeDefinitionDeserializer; +use crate::error::{Error, KbinErrorKind}; +use crate::node::NodeCollection; #[derive(Debug)] enum ReadState { diff --git a/src/de/seq.rs b/src/de/seq.rs index 075d213..a4f1474 100644 --- a/src/de/seq.rs +++ b/src/de/seq.rs @@ -2,11 +2,11 @@ use std::collections::VecDeque; use serde::de::{DeserializeSeed, IntoDeserializer, SeqAccess}; -use de::collection::NodeCollectionDeserializer; -use error::{Error, KbinErrorKind}; -use node::NodeCollection; -use node_types::StandardType; -use value::Value; +use crate::de::collection::NodeCollectionDeserializer; +use crate::error::{Error, KbinErrorKind}; +use crate::node::NodeCollection; +use crate::node_types::StandardType; +use crate::value::Value; enum SequenceMode { Struct { diff --git a/src/de/structure.rs b/src/de/structure.rs index 7e593cf..f6ab384 100644 --- a/src/de/structure.rs +++ b/src/de/structure.rs @@ -1,11 +1,11 @@ use serde::de::{DeserializeSeed, IntoDeserializer, MapAccess}; -use de::Custom; -use de::collection::NodeCollectionDeserializer; -use de::definition::NodeDefinitionDeserializer; -use error::Error; -use node::NodeCollection; -use node_types::StandardType; +use crate::de::Custom; +use crate::de::collection::NodeCollectionDeserializer; +use crate::de::definition::NodeDefinitionDeserializer; +use crate::error::Error; +use crate::node::NodeCollection; +use crate::node_types::StandardType; pub struct Struct<'a> { collection: &'a mut NodeCollection, diff --git a/src/encoding_type.rs b/src/encoding_type.rs index a038e39..e840bfd 100644 --- a/src/encoding_type.rs +++ b/src/encoding_type.rs @@ -1,6 +1,6 @@ use std::fmt; -use error::{KbinError, KbinErrorKind}; +use crate::error::{KbinError, KbinErrorKind}; use failure::ResultExt; /// The `encoding_rs` crate uses the following to describe their counterparts: diff --git a/src/error.rs b/src/error.rs index aad6e08..111b30f 100644 --- a/src/error.rs +++ b/src/error.rs @@ -5,8 +5,8 @@ use std::string::FromUtf8Error; use failure::{Backtrace, Context, Fail}; use quick_xml::Error as QuickXmlError; -use node_types::{KbinType, StandardType}; -use value::Value; +use crate::node_types::{KbinType, StandardType}; +use crate::value::Value; pub type Result = StdResult; diff --git a/src/lib.rs b/src/lib.rs index 8f897d6..2ca281e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -35,23 +35,23 @@ mod to_text_xml; mod value; mod writer; -use node::NodeDefinition; -use text_reader::TextXmlReader; -use to_text_xml::TextXmlWriter; +use crate::node::NodeDefinition; +use crate::text_reader::TextXmlReader; +use crate::to_text_xml::TextXmlWriter; // Public exports -pub use compression::Compression; -pub use encoding_type::EncodingType; -pub use printer::Printer; -pub use reader::Reader; -pub use error::{KbinError, KbinErrorKind, Result}; -pub use node::{Node, NodeCollection}; -pub use node_types::StandardType; -pub use options::Options; -pub use to_element::ToElement; -pub use to_text_xml::ToTextXml; -pub use value::Value; -pub use writer::{Writer, Writeable}; +pub use crate::compression::Compression; +pub use crate::encoding_type::EncodingType; +pub use crate::printer::Printer; +pub use crate::reader::Reader; +pub use crate::error::{KbinError, KbinErrorKind, Result}; +pub use crate::node::{Node, NodeCollection}; +pub use crate::node_types::StandardType; +pub use crate::options::Options; +pub use crate::to_element::ToElement; +pub use crate::to_text_xml::ToTextXml; +pub use crate::value::Value; +pub use crate::writer::{Writer, Writeable}; cfg_if! { if #[cfg(feature = "serde")] { @@ -62,9 +62,9 @@ cfg_if! { mod de; mod ser; - pub use de::from_bytes as serde_from_bytes; - pub use node::ExtraNodes; - pub use ser::to_bytes as serde_to_bytes; + pub use crate::de::from_bytes as serde_from_bytes; + pub use crate::node::ExtraNodes; + pub use crate::ser::to_bytes as serde_to_bytes; } } diff --git a/src/node/collection.rs b/src/node/collection.rs index 92cf284..4d26461 100644 --- a/src/node/collection.rs +++ b/src/node/collection.rs @@ -2,10 +2,10 @@ use std::collections::VecDeque; use std::fmt; use std::iter::Iterator; -use error::{KbinError, KbinErrorKind}; -use node::{Node, NodeDefinition}; -use node_types::StandardType; -use value::Value; +use crate::error::{KbinError, KbinErrorKind}; +use crate::node::{Node, NodeDefinition}; +use crate::node_types::StandardType; +use crate::value::Value; fn parse_index(s: &str) -> Option { if s.starts_with('+') || (s.starts_with('0') && s.len() != 1) { diff --git a/src/node/de.rs b/src/node/de.rs index f5e4efd..5d13ee2 100644 --- a/src/node/de.rs +++ b/src/node/de.rs @@ -4,9 +4,9 @@ use std::marker::PhantomData; use serde::de::{self, Deserialize, DeserializeSeed, Error, EnumAccess, IntoDeserializer, MapAccess, SeqAccess, VariantAccess, Visitor}; use serde::de::value::{MapDeserializer, SeqDeserializer}; -use node::Node; -use node_types::StandardType; -use value::Value; +use crate::node::Node; +use crate::node_types::StandardType; +use crate::value::Value; pub(crate) struct NodeVisitor { key: Option, @@ -21,7 +21,7 @@ impl<'de> NodeVisitor { match node_type { StandardType::Attribute => Err(A::Error::custom("`Attribute` nodes must be handled elsewhere")), StandardType::NodeStart => { - let value = try!(map.next_value_seed(NodeValueSeed(key.to_owned()))); + let value = map.next_value_seed(NodeValueSeed(key.to_owned()))?; debug!("NodeVisitor::map_to_node(node_type: {:?}) => value: {:?}", node_type, value); Ok(value) @@ -29,7 +29,7 @@ impl<'de> NodeVisitor { // Rolling up the `NodeStart` handling and other value types is not going // to happen as `NodeStart` nodes do not have a value node_type => { - let node = try!(map.next_value_seed(NodeWithValueSeed(key.to_owned()))); + let node = map.next_value_seed(NodeWithValueSeed(key.to_owned()))?; debug!("NodeVisitor::map_to_node(node_type: {:?}) => node: {:?}", node_type, node); Ok(node) @@ -53,20 +53,20 @@ impl<'de> Visitor<'de> for NodeVisitor { let mut node = Node::new(self.key.unwrap_or_else(|| "".to_owned())); - while let Some(NodeStart { key, node_type }) = try!(map.next_key()) { + while let Some(NodeStart { key, node_type }) = map.next_key()? { debug!("NodeVisitor::visit_map() => node_type: {:?}, key: {:?}", node_type, key); if key == "__value" { trace!("NodeVisitor::visit_map() => got __value, getting node value"); - let node_value = try!(map.next_value()); + let node_value = map.next_value()?; debug!("NodeVisitor::visit_map() => node value: {:?}", node_value); node.set_value(Some(node_value)); } else if key == "__node_key" { trace!("NodeVisitor::visit_map() => got __node_key, getting node key"); - let node_key: String = try!(map.next_value()); + let node_key: String = map.next_value()?; debug!("NodeVisitor::visit_map() => node key: {:?}", node_key); node.set_key(node_key); @@ -76,7 +76,7 @@ impl<'de> Visitor<'de> for NodeVisitor { let value = map.next_value(); debug!("NodeVisitor::visit_map() => value: {:?}", value); - if let Value::Attribute(s) = try!(value) { + if let Value::Attribute(s) = value? { //let key = String::from(&key["attr_".len()..]); node.set_attr(key, s); } else { diff --git a/src/node/definition.rs b/src/node/definition.rs index ccd2156..65e0f38 100644 --- a/src/node/definition.rs +++ b/src/node/definition.rs @@ -2,13 +2,13 @@ use std::fmt; use bytes::Bytes; -use byte_buffer::strip_trailing_null_bytes; -use encoding_type::EncodingType; -use error::{KbinError, KbinErrorKind}; -use node::Node; -use node_types::StandardType; -use sixbit::{Sixbit, SixbitSize}; -use value::Value; +use crate::byte_buffer::strip_trailing_null_bytes; +use crate::encoding_type::EncodingType; +use crate::error::{KbinError, KbinErrorKind}; +use crate::node::Node; +use crate::node_types::StandardType; +use crate::sixbit::{Sixbit, SixbitSize}; +use crate::value::Value; #[derive(Clone, Eq)] pub enum Key { diff --git a/src/node/extra/de.rs b/src/node/extra/de.rs index 419f7dc..4d0ce43 100644 --- a/src/node/extra/de.rs +++ b/src/node/extra/de.rs @@ -2,10 +2,10 @@ use std::fmt; use serde::de::{self, Deserialize, Error, MapAccess, Visitor}; -use node::Node; -use node::extra::ExtraNodes; -use node::marshal::{Marshal, MarshalValue}; -use value::Value; +use crate::node::Node; +use crate::node::extra::ExtraNodes; +use crate::node::marshal::{Marshal, MarshalValue}; +use crate::value::Value; impl<'de> Deserialize<'de> for ExtraNodes { #[inline] @@ -29,20 +29,20 @@ impl<'de> Deserialize<'de> for ExtraNodes { let mut extra = ExtraNodes::new(); - while let Some(key) = try!(map.next_key::()) { + while let Some(key) = map.next_key::()? { debug!("ExtraNodesVisitor::visit_map() => key: {:?}", key); if key == "__node_key" { debug!("ExtraNodesVisitor::visit_map() => got __node_key, getting node key"); - let node_key: String = try!(map.next_value()); + let node_key: String = map.next_value()?; debug!("ExtraNodesVisitor::visit_map() => node key: {:?}", node_key); extra.set_parent_key(node_key); continue; } - let marshal: Marshal = try!(map.next_value()); + let marshal: Marshal = map.next_value()?; debug!("ExtraNodesVisitor::visit_map() => marshal: {:?}", marshal); let value = marshal.into_inner(); diff --git a/src/node/extra/mod.rs b/src/node/extra/mod.rs index 3a4d33b..aec7b5a 100644 --- a/src/node/extra/mod.rs +++ b/src/node/extra/mod.rs @@ -2,7 +2,7 @@ use std::mem; use indexmap::IndexMap; -use node::Node; +use crate::node::Node; mod de; mod ser; diff --git a/src/node/extra/ser.rs b/src/node/extra/ser.rs index e5dd41a..09e0c28 100644 --- a/src/node/extra/ser.rs +++ b/src/node/extra/ser.rs @@ -1,6 +1,6 @@ use serde::ser::{Serialize, SerializeMap}; -use node::ExtraNodes; +use crate::node::ExtraNodes; impl Serialize for ExtraNodes { #[inline] diff --git a/src/node/marshal.rs b/src/node/marshal.rs index c7a9e0e..e44838e 100644 --- a/src/node/marshal.rs +++ b/src/node/marshal.rs @@ -3,10 +3,10 @@ use std::marker::PhantomData; use serde::de::{self, Deserialize, DeserializeSeed, IntoDeserializer, SeqAccess, Visitor}; -use node::Node; -use node::de::NodeSeed; -use node_types::StandardType; -use value::Value; +use crate::node::Node; +use crate::node::de::NodeSeed; +use crate::node_types::StandardType; +use crate::value::Value; #[derive(Debug)] pub enum MarshalValue { diff --git a/src/node/mod.rs b/src/node/mod.rs index a8cb448..10708fb 100644 --- a/src/node/mod.rs +++ b/src/node/mod.rs @@ -4,7 +4,7 @@ use std::mem; use indexmap::IndexMap; -use value::Value; +use crate::value::Value; mod collection; mod definition; diff --git a/src/node/ser.rs b/src/node/ser.rs index 0c00818..7462df9 100644 --- a/src/node/ser.rs +++ b/src/node/ser.rs @@ -1,6 +1,6 @@ use serde::ser::Serialize; -use node::Node; +use crate::node::Node; impl Serialize for Node { #[inline] diff --git a/src/options.rs b/src/options.rs index 305ba64..d656acd 100644 --- a/src/options.rs +++ b/src/options.rs @@ -1,5 +1,5 @@ -use compression::Compression; -use encoding_type::EncodingType; +use crate::compression::Compression; +use crate::encoding_type::EncodingType; #[derive(Clone, Debug, Default)] pub struct Options { diff --git a/src/printer.rs b/src/printer.rs index dfaabf4..e56c176 100644 --- a/src/printer.rs +++ b/src/printer.rs @@ -1,9 +1,9 @@ use bytes::Bytes; -use error::Result; -use node::NodeCollection; -use node_types::StandardType; -use reader::Reader; +use crate::error::Result; +use crate::node::NodeCollection; +use crate::node_types::StandardType; +use crate::reader::Reader; pub struct Printer; diff --git a/src/reader.rs b/src/reader.rs index c35fd9c..abe069d 100644 --- a/src/reader.rs +++ b/src/reader.rs @@ -2,13 +2,13 @@ use bytes::Bytes; use byteorder::{BigEndian, ReadBytesExt}; use failure::ResultExt; -use byte_buffer::ByteBufferRead; -use compression::Compression; -use encoding_type::EncodingType; -use error::{KbinErrorKind, Result}; -use node::{Key, NodeData, NodeDefinition}; -use node_types::StandardType; -use sixbit::Sixbit; +use crate::byte_buffer::ByteBufferRead; +use crate::compression::Compression; +use crate::encoding_type::EncodingType; +use crate::error::{KbinErrorKind, Result}; +use crate::node::{Key, NodeData, NodeDefinition}; +use crate::node_types::StandardType; +use crate::sixbit::Sixbit; use super::{ARRAY_MASK, SIGNATURE}; diff --git a/src/ser/buffer.rs b/src/ser/buffer.rs index fb5cc5f..296cbf5 100644 --- a/src/ser/buffer.rs +++ b/src/ser/buffer.rs @@ -2,8 +2,8 @@ use byteorder::{BigEndian, WriteBytesExt}; use failure::ResultExt; use serde::ser::{self, Impossible, Serialize}; -use error::{Error, KbinErrorKind}; -use node_types::StandardType; +use crate::error::{Error, KbinErrorKind}; +use crate::node_types::StandardType; pub struct BufferSerializer { buffer: Vec, diff --git a/src/ser/custom.rs b/src/ser/custom.rs index 6cdf546..024a95d 100644 --- a/src/ser/custom.rs +++ b/src/ser/custom.rs @@ -1,8 +1,8 @@ use serde::ser::{Serialize, SerializeTupleStruct}; -use error::KbinErrorKind; -use node_types::StandardType; -use ser::{Error, Result, Serializer, TypeHint, WriteMode}; +use crate::error::KbinErrorKind; +use crate::node_types::StandardType; +use crate::ser::{Error, Result, Serializer, TypeHint, WriteMode}; pub struct Custom<'a> { ser: &'a mut Serializer, diff --git a/src/ser/map.rs b/src/ser/map.rs index 1b5073a..76d221d 100644 --- a/src/ser/map.rs +++ b/src/ser/map.rs @@ -2,10 +2,10 @@ use byteorder::WriteBytesExt; use failure::ResultExt; use serde::ser::{Serialize, SerializeMap}; -use error::{Error, KbinErrorKind}; -use node_types::StandardType; -use ser::{Result, Serializer, TypeHint, WriteMode, ARRAY_MASK}; -use sixbit::Sixbit; +use crate::error::{Error, KbinErrorKind}; +use crate::node_types::StandardType; +use crate::ser::{Result, Serializer, TypeHint, WriteMode, ARRAY_MASK}; +use crate::sixbit::Sixbit; pub struct Map<'a> { ser: &'a mut Serializer, diff --git a/src/ser/mod.rs b/src/ser/mod.rs index 5bd10f7..7cfd9b8 100644 --- a/src/ser/mod.rs +++ b/src/ser/mod.rs @@ -5,11 +5,11 @@ use byteorder::{BigEndian, ByteOrder, WriteBytesExt}; use failure::ResultExt; use serde::ser::{self, Impossible, Serialize}; -use byte_buffer::ByteBufferWrite; -use encoding_type::EncodingType; -use node_types::StandardType; -use error::{Error, KbinError, KbinErrorKind}; -use sixbit::Sixbit; +use crate::byte_buffer::ByteBufferWrite; +use crate::encoding_type::EncodingType; +use crate::node_types::StandardType; +use crate::error::{Error, KbinError, KbinErrorKind}; +use crate::sixbit::Sixbit; use super::{ARRAY_MASK, SIGNATURE, SIG_COMPRESSED}; mod buffer; diff --git a/src/ser/seq.rs b/src/ser/seq.rs index 1702e53..2e0375e 100644 --- a/src/ser/seq.rs +++ b/src/ser/seq.rs @@ -4,9 +4,9 @@ use byteorder::{BigEndian, WriteBytesExt}; use failure::ResultExt; use serde::ser::{Serialize, SerializeSeq}; -use error::KbinErrorKind; -use node_types::StandardType; -use ser::{Error, Result, Serializer, TypeHint, WriteMode}; +use crate::error::KbinErrorKind; +use crate::node_types::StandardType; +use crate::ser::{Error, Result, Serializer, TypeHint, WriteMode}; pub struct Seq<'a> { ser: &'a mut Serializer, diff --git a/src/ser/structure.rs b/src/ser/structure.rs index b8ace62..925ebc5 100644 --- a/src/ser/structure.rs +++ b/src/ser/structure.rs @@ -2,9 +2,9 @@ use byteorder::WriteBytesExt; use failure::ResultExt; use serde::ser::{Serialize, SerializeStruct}; -use error::{Error, KbinErrorKind}; -use node_types::StandardType; -use ser::{Result, Serializer, TypeHint, ARRAY_MASK}; +use crate::error::{Error, KbinErrorKind}; +use crate::node_types::StandardType; +use crate::ser::{Result, Serializer, TypeHint, ARRAY_MASK}; pub struct Struct<'a> { ser: &'a mut Serializer, diff --git a/src/ser/tuple.rs b/src/ser/tuple.rs index ac7c625..6e010bb 100644 --- a/src/ser/tuple.rs +++ b/src/ser/tuple.rs @@ -1,9 +1,9 @@ use serde::ser::{Serialize, SerializeTuple}; -use error::KbinErrorKind; -use node_types::StandardType; -use ser::{Error, Result, Serializer, TypeHint}; -use ser::buffer::BufferSerializer; +use crate::error::KbinErrorKind; +use crate::node_types::StandardType; +use crate::ser::{Error, Result, Serializer, TypeHint}; +use crate::ser::buffer::BufferSerializer; /// Tuple handler for serialization. /// diff --git a/src/sixbit.rs b/src/sixbit.rs index 944ddc6..17508bb 100644 --- a/src/sixbit.rs +++ b/src/sixbit.rs @@ -4,7 +4,7 @@ use std::io::{Read, Write}; use byteorder::{ReadBytesExt, WriteBytesExt}; use failure::ResultExt; -use error::{KbinError, KbinErrorKind}; +use crate::error::{KbinError, KbinErrorKind}; static CHAR_MAP: &'static [u8] = b"0123456789:ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz"; diff --git a/src/text_reader.rs b/src/text_reader.rs index 40842b2..a16cbbd 100644 --- a/src/text_reader.rs +++ b/src/text_reader.rs @@ -6,11 +6,11 @@ use quick_xml::Reader; use quick_xml::events::{BytesStart, BytesText, Event}; use quick_xml::events::attributes::Attributes; -use encoding_type::EncodingType; -use error::{KbinErrorKind, Result}; -use node::{Key, NodeData, NodeCollection, NodeDefinition}; -use node_types::StandardType; -use value::Value; +use crate::encoding_type::EncodingType; +use crate::error::{KbinErrorKind, Result}; +use crate::node::{Key, NodeData, NodeCollection, NodeDefinition}; +use crate::node_types::StandardType; +use crate::value::Value; pub struct TextXmlReader<'a> { xml_reader: Reader<&'a [u8]>, diff --git a/src/to_element/node.rs b/src/to_element/node.rs index 790b9e7..ade03a9 100644 --- a/src/to_element/node.rs +++ b/src/to_element/node.rs @@ -2,9 +2,9 @@ use std::fmt::Write; use minidom::Element; -use node::Node; -use to_element::ToElement; -use value::Value; +use crate::node::Node; +use crate::to_element::ToElement; +use crate::value::Value; impl ToElement for Node { fn to_element(&self) -> Element { diff --git a/src/to_text_xml/mod.rs b/src/to_text_xml/mod.rs index dbd5bf8..f1a23b9 100644 --- a/src/to_text_xml/mod.rs +++ b/src/to_text_xml/mod.rs @@ -3,8 +3,8 @@ use std::io::{Cursor, Write}; use quick_xml::Writer; use quick_xml::events::{BytesDecl, Event}; -use encoding_type::EncodingType; -use error::KbinError; +use crate::encoding_type::EncodingType; +use crate::error::KbinError; mod node; mod node_collection; diff --git a/src/to_text_xml/node.rs b/src/to_text_xml/node.rs index f84d6a6..ec1fccb 100644 --- a/src/to_text_xml/node.rs +++ b/src/to_text_xml/node.rs @@ -5,12 +5,12 @@ use quick_xml::Writer; use quick_xml::events::{BytesEnd, BytesStart, BytesText, Event}; use quick_xml::events::attributes::Attribute; -use encoding_type::EncodingType; -use error::KbinError; -use node::Node; -use node_types::StandardType; -use to_text_xml::ToTextXml; -use value::Value; +use crate::encoding_type::EncodingType; +use crate::error::KbinError; +use crate::node::Node; +use crate::node_types::StandardType; +use crate::to_text_xml::ToTextXml; +use crate::value::Value; impl ToTextXml for Node { /// At the moment, a `Node` will always contain UTF-8 data. diff --git a/src/to_text_xml/node_collection.rs b/src/to_text_xml/node_collection.rs index d9f78e7..30b7b24 100644 --- a/src/to_text_xml/node_collection.rs +++ b/src/to_text_xml/node_collection.rs @@ -5,11 +5,11 @@ use quick_xml::Writer; use quick_xml::events::{BytesEnd, BytesStart, BytesText, Event}; use quick_xml::events::attributes::Attribute; -use encoding_type::EncodingType; -use error::{KbinError, KbinErrorKind}; -use node::NodeCollection; -use node_types::StandardType; -use to_text_xml::ToTextXml; +use crate::encoding_type::EncodingType; +use crate::error::{KbinError, KbinErrorKind}; +use crate::node::NodeCollection; +use crate::node_types::StandardType; +use crate::to_text_xml::ToTextXml; impl ToTextXml for NodeCollection { /// At the moment, decoding the value of a `NodeDefinition` will decode diff --git a/src/value/de.rs b/src/value/de.rs index bb777d7..4ddf4d3 100644 --- a/src/value/de.rs +++ b/src/value/de.rs @@ -4,9 +4,9 @@ use std::marker::PhantomData; use serde::de::{Deserialize, Deserializer, EnumAccess, Error, IntoDeserializer, SeqAccess, VariantAccess, Visitor}; use serde::de::value::SeqDeserializer; -use node::Marshal; -use node_types::StandardType; -use value::Value; +use crate::node::Marshal; +use crate::node_types::StandardType; +use crate::value::Value; impl<'de> Deserialize<'de> for Value { #[inline] @@ -101,7 +101,7 @@ impl<'de> Deserialize<'de> for Value { let mut vec = Vec::new(); let mut array_node_type = None; - while let Some(elem) = try!(seq.next_element()) { + while let Some(elem) = seq.next_element()? { let elem: Value = elem; let node_type = elem.standard_type(); diff --git a/src/value/mod.rs b/src/value/mod.rs index f7648d4..ac3d98c 100644 --- a/src/value/mod.rs +++ b/src/value/mod.rs @@ -8,9 +8,9 @@ use byteorder::{BigEndian, ByteOrder, WriteBytesExt}; use failure::{Fail, ResultExt}; use rustc_hex::FromHex; -use error::{KbinError, KbinErrorKind}; -use node::Node; -use node_types::{self, StandardType}; +use crate::error::{KbinError, KbinErrorKind}; +use crate::node::Node; +use crate::node_types::{self, StandardType}; cfg_if! { if #[cfg(feature = "serde")] { @@ -20,7 +20,7 @@ cfg_if! { pub(crate) mod de; mod ser; - use node::de::NodeSeed; + use crate::node::de::NodeSeed; } } diff --git a/src/value/ser.rs b/src/value/ser.rs index d123207..29180e7 100644 --- a/src/value/ser.rs +++ b/src/value/ser.rs @@ -1,6 +1,6 @@ use serde::ser::{Serialize, SerializeTupleStruct}; -use value::Value; +use crate::value::Value; impl Serialize for Value { #[inline] diff --git a/src/writer.rs b/src/writer.rs index a001f01..84bd706 100644 --- a/src/writer.rs +++ b/src/writer.rs @@ -5,14 +5,14 @@ use failure::ResultExt; use minidom::Element; use rustc_hex::FromHex; -use byte_buffer::ByteBufferWrite; -use compression::Compression; -use error::{KbinErrorKind, Result}; -use node::{Node, NodeCollection}; -use node_types::StandardType; -use options::Options; -use sixbit::Sixbit; -use value::Value; +use crate::byte_buffer::ByteBufferWrite; +use crate::compression::Compression; +use crate::error::{KbinErrorKind, Result}; +use crate::node::{Node, NodeCollection}; +use crate::node_types::StandardType; +use crate::options::Options; +use crate::sixbit::Sixbit; +use crate::value::Value; use super::{ARRAY_MASK, SIGNATURE};