diff --git a/Cargo.toml b/Cargo.toml index de37d1c..f1961d7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kbinxml" -version = "0.2.3" +version = "0.3.0" authors = ["Matt Bilker "] [dependencies] diff --git a/src/bin/kbinxml.rs b/src/bin/kbinxml.rs index 12965e5..3c020d2 100644 --- a/src/bin/kbinxml.rs +++ b/src/bin/kbinxml.rs @@ -11,7 +11,7 @@ use std::fs::File; use std::io::{Cursor, Error as IoError, ErrorKind as IoErrorKind, Read, Write, stdout}; use failure::Fail; -use kbinxml::{EncodingOptions, KbinXml}; +use kbinxml::{KbinXml, Options}; use minidom::Element; use quick_xml::Writer; @@ -102,7 +102,7 @@ fn main() -> std::io::Result<()> { let text_original = to_text(&element)?; display_buf(&text_original)?; - let options = EncodingOptions::with_encoding(encoding_original); + let options = Options::with_encoding(encoding_original); let buf = KbinXml::to_binary_with_options(options, &element).map_err(display_err)?; compare_slice(&buf, &contents); diff --git a/src/lib.rs b/src/lib.rs index 54c39d7..b6b9730 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -34,7 +34,7 @@ use sixbit::{pack_sixbit, unpack_sixbit}; // Public exports pub use encoding_type::EncodingType; pub use error::{KbinError, KbinErrorKind}; -pub use options::EncodingOptions; +pub use options::Options; const SIGNATURE: u8 = 0xA0; @@ -45,7 +45,7 @@ const ARRAY_MASK: u8 = 1 << 6; // 1 << 6 = 64 type Result = StdResult; pub struct KbinXml { - options: EncodingOptions, + options: Options, offset_1: u64, offset_2: u64, @@ -54,14 +54,14 @@ pub struct KbinXml { impl KbinXml { pub fn new() -> Self { Self { - options: EncodingOptions::default(), + options: Options::default(), offset_1: 0, offset_2: 0, } } - pub fn with_options(options: EncodingOptions) -> Self { + pub fn with_options(options: Options) -> Self { Self { options, @@ -578,7 +578,7 @@ impl KbinXml { kbinxml.to_binary_internal(input) } - pub fn to_binary_with_options(options: EncodingOptions, input: &Element) -> Result> { + pub fn to_binary_with_options(options: Options, input: &Element) -> Result> { let mut kbinxml = KbinXml::with_options(options); kbinxml.to_binary_internal(input) } diff --git a/src/options.rs b/src/options.rs index 713c7b3..fcfa69f 100644 --- a/src/options.rs +++ b/src/options.rs @@ -1,11 +1,11 @@ use encoding_type::EncodingType; #[derive(Clone, Debug, Default)] -pub struct EncodingOptions { +pub struct Options { pub(crate) encoding: EncodingType, } -impl EncodingOptions { +impl Options { pub fn new() -> Self { Self::default() }