EBML: Bring branch up to date

Author: Serial-ATA

lofty/src/ebml/read.rs

@@ -8,9 +8,9 @@ mod segment_tracks;
 
 use super::EbmlFile;
 use crate::config::ParseOptions;
+use crate::ebml::EbmlProperties;
 use crate::ebml::element_reader::{ElementHeader, ElementIdent, ElementReader, ElementReaderYield};
 use crate::ebml::vint::ElementId;
-use crate::ebml::EbmlProperties;
 use crate::error::Result;
 use crate::macros::decode_err;
 

lofty/src/ebml/read/segment.rs

@@ -1,9 +1,9 @@
 use super::{segment_attachments, segment_cluster, segment_info, segment_tags, segment_tracks};
 use crate::config::ParseOptions;
+use crate::ebml::ElementId;
 use crate::ebml::element_reader::{ElementHeader, ElementIdent, ElementReader, ElementReaderYield};
 use crate::ebml::properties::EbmlProperties;
 use crate::ebml::tag::MatroskaTag;
-use crate::ebml::ElementId;
 use crate::error::Result;
 
 use std::io::{Read, Seek};

lofty/src/ebml/read/segment_chapters.rs

@@ -1,6 +1,6 @@
 use crate::config::ParseOptions;
-use crate::ebml::element_reader::ElementChildIterator;
 use crate::ebml::MatroskaTag;
+use crate::ebml::element_reader::ElementChildIterator;
 use crate::error::Result;
 
 use std::io::{Read, Seek};

lofty/src/ebml/read/segment_cluster.rs

@@ -1,9 +1,9 @@
 use crate::config::ParseOptions;
+use crate::ebml::VInt;
 use crate::ebml::element_reader::{
 	ChildElementDescriptor, ElementChildIterator, ElementIdent, ElementReaderYield,
 };
 use crate::ebml::properties::EbmlProperties;
-use crate::ebml::VInt;
 use crate::error::Result;
 
 use std::io::{Read, Seek};

lofty/src/ebml/tag/generic.rs

@@ -2,7 +2,7 @@
 //!
 //! NOTE: We can **ONLY** convert `SimpleTags` that come from a target with **NO** uids
 
-use super::{Language, MatroskaTag, SimpleTag, TargetType, TOMBSTONE_SIMPLE_TAG};
+use super::{Language, MatroskaTag, SimpleTag, TOMBSTONE_SIMPLE_TAG, TargetType};
 use crate::tag::items::Lang;
 use crate::tag::{ItemKey, ItemValue, Tag, TagItem, TagType};
 

lofty/src/ebml/tag/mod.rs

@@ -15,7 +15,7 @@ pub use tag::*;
 pub use tag_name::*;
 pub use target::*;
 
-use crate::config::{global_options, WriteOptions};
+use crate::config::{WriteOptions, global_options};
 use crate::error::{LoftyError, Result};
 use crate::io::{FileLike, Length, Truncate};
 use crate::picture::Picture;

lofty/src/ebml/tag/write/elements/attached_file.rs

@@ -1,4 +1,4 @@
-use crate::ebml::tag::write::{write_element, ElementWriterCtx, WriteableElement};
+use crate::ebml::tag::write::{ElementWriterCtx, WriteableElement, write_element};
 use crate::ebml::{AttachedFile, ElementId, VInt};
 use crate::io::FileLike;
 

lofty/src/ebml/tag/write/elements/simple_tag.rs

@@ -1,4 +1,4 @@
-use crate::ebml::tag::write::{write_element, ElementWriterCtx, WriteableElement};
+use crate::ebml::tag::write::{ElementWriterCtx, WriteableElement, write_element};
 use crate::ebml::{ElementId, Language, SimpleTag, TagValue};
 use crate::io::FileLike;
 

lofty/src/ebml/tag/write/elements/tags.rs

@@ -1,4 +1,4 @@
-use crate::ebml::tag::write::{write_element, ElementWriterCtx, WriteableElement};
+use crate::ebml::tag::write::{ElementWriterCtx, WriteableElement, write_element};
 use crate::ebml::{ElementId, TagRef};
 use crate::io::FileLike;
 

lofty/src/ebml/tag/write/elements/target.rs

@@ -1,4 +1,4 @@
-use crate::ebml::tag::write::{write_element, EbmlWriteExt, ElementWriterCtx, WriteableElement};
+use crate::ebml::tag::write::{EbmlWriteExt, ElementWriterCtx, WriteableElement, write_element};
 use crate::ebml::{ElementId, TargetDescriptor, TargetType, VInt};
 use crate::io::FileLike;