Reformat code

Author: uklotzde

benches/create_tag.rs

@@ -67,8 +67,8 @@ bench_tag_write!([
 		);
 	}),
 	(id3v2, Id3v2Tag, |tag| {
-		use lofty::id3::v2::{Frame, TextInformationFrame};
 		use lofty::TextEncoding;
+		use lofty::id3::v2::{Frame, TextInformationFrame};
 
 		let picture = Picture::new_unchecked(
 			PictureType::CoverFront,

lofty/src/aac/read.rs

@@ -1,12 +1,12 @@
-use super::header::{ADTSHeader, HEADER_MASK};
 use super::AacFile;
+use super::header::{ADTSHeader, HEADER_MASK};
 use crate::config::{ParseOptions, ParsingMode};
 use crate::error::Result;
 use crate::id3::v2::header::Id3v2Header;
 use crate::id3::v2::read::parse_id3v2;
-use crate::id3::{find_id3v1, ID3FindResults};
+use crate::id3::{ID3FindResults, find_id3v1};
 use crate::macros::{decode_err, err, parse_mode_choice};
-use crate::mpeg::header::{cmp_header, search_for_frame_sync, HeaderCmpResult};
+use crate::mpeg::header::{HeaderCmpResult, cmp_header, search_for_frame_sync};
 
 use std::io::{Read, Seek, SeekFrom};
 
@@ -180,7 +180,7 @@ where
 					return Ok(Some((
 						first_header,
 						first_adts_frame_start_absolute + u64::from(header_len),
-					)))
+					)));
 				},
 				HeaderCmpResult::Undetermined => return Ok(None),
 				HeaderCmpResult::NotEqual => {},

lofty/src/ape/mod.rs

@@ -20,8 +20,8 @@ use lofty_attr::LoftyFile;
 
 pub use crate::picture::APE_PICTURE_TYPES;
 pub use properties::ApeProperties;
-pub use tag::item::ApeItem;
 pub use tag::ApeTag;
+pub use tag::item::ApeItem;
 
 /// An APE file
 #[derive(LoftyFile)]

lofty/src/ape/read.rs

@@ -7,7 +7,7 @@ use crate::error::Result;
 use crate::id3::v1::tag::Id3v1Tag;
 use crate::id3::v2::read::parse_id3v2;
 use crate::id3::v2::tag::Id3v2Tag;
-use crate::id3::{find_id3v1, find_id3v2, find_lyrics3v2, FindId3v2Config, ID3FindResults};
+use crate::id3::{FindId3v2Config, ID3FindResults, find_id3v1, find_id3v2, find_lyrics3v2};
 use crate::macros::{decode_err, err};
 
 use std::io::{Read, Seek, SeekFrom};

lofty/src/ape/tag/mod.rs

@@ -5,10 +5,10 @@ mod write;
 use crate::ape::tag::item::{ApeItem, ApeItemRef};
 use crate::config::WriteOptions;
 use crate::error::{LoftyError, Result};
-use crate::id3::v2::util::pairs::{format_number_pair, set_number, NUMBER_PAIR_KEYS};
+use crate::id3::v2::util::pairs::{NUMBER_PAIR_KEYS, format_number_pair, set_number};
 use crate::tag::item::ItemValueRef;
 use crate::tag::{
-	try_parse_year, Accessor, ItemKey, ItemValue, MergeTag, SplitTag, Tag, TagExt, TagItem, TagType,
+	Accessor, ItemKey, ItemValue, MergeTag, SplitTag, Tag, TagExt, TagItem, TagType, try_parse_year,
 };
 use crate::util::flag_item;
 use crate::util::io::{FileLike, Truncate};

lofty/src/ape/tag/read.rs

@@ -1,8 +1,8 @@
-use super::item::ApeItem;
 use super::ApeTag;
+use super::item::ApeItem;
+use crate::ape::APE_PICTURE_TYPES;
 use crate::ape::constants::{APE_PREAMBLE, INVALID_KEYS};
 use crate::ape::header::{self, ApeHeader};
-use crate::ape::APE_PICTURE_TYPES;
 use crate::config::ParseOptions;
 use crate::error::Result;
 use crate::macros::{decode_err, err, try_vec};

lofty/src/ape/tag/write.rs

@@ -1,10 +1,10 @@
-use super::item::ApeItemRef;
 use super::ApeTagRef;
+use super::item::ApeItemRef;
 use crate::ape::constants::APE_PREAMBLE;
 use crate::ape::tag::read;
 use crate::config::{ParseOptions, WriteOptions};
 use crate::error::{LoftyError, Result};
-use crate::id3::{find_id3v1, find_id3v2, find_lyrics3v2, FindId3v2Config};
+use crate::id3::{FindId3v2Config, find_id3v1, find_id3v2, find_lyrics3v2};
 use crate::macros::{decode_err, err};
 use crate::probe::Probe;
 use crate::tag::item::ItemValueRef;
@@ -134,7 +134,7 @@ where
 
 	// Now, if there was a tag at the beginning, remove it
 	if header_ape_tag.0 {
-		file_bytes.drain(header_ape_tag.1 .0 as usize..header_ape_tag.1 .1 as usize);
+		file_bytes.drain(header_ape_tag.1.0 as usize..header_ape_tag.1.1 as usize);
 	}
 
 	file.rewind()?;

lofty/src/config/global_options.rs

@@ -13,7 +13,7 @@ pub(crate) unsafe fn global_options() -> &'static GlobalOptions {
 /// # Examples
 ///
 /// ```rust
-/// use lofty::config::{apply_global_options, GlobalOptions};
+/// use lofty::config::{GlobalOptions, apply_global_options};
 ///
 /// // I have a custom resolver that I need checked
 /// let global_options = GlobalOptions::new().use_custom_resolvers(true);
@@ -58,7 +58,7 @@ impl GlobalOptions {
 	/// # Examples
 	///
 	/// ```rust
-	/// use lofty::config::{apply_global_options, GlobalOptions};
+	/// use lofty::config::{GlobalOptions, apply_global_options};
 	///
 	/// // By default, `use_custom_resolvers` is enabled. Here, we don't want to use them.
 	/// let global_options = GlobalOptions::new().use_custom_resolvers(false);
@@ -77,7 +77,7 @@ impl GlobalOptions {
 	/// # Examples
 	///
 	/// ```rust
-	/// use lofty::config::{apply_global_options, GlobalOptions};
+	/// use lofty::config::{GlobalOptions, apply_global_options};
 	///
 	/// // I have files with gigantic images, I'll double the allocation limit!
 	/// let global_options = GlobalOptions::new().allocation_limit(32 * 1024 * 1024);
@@ -100,7 +100,7 @@ impl GlobalOptions {
 	/// # Examples
 	///
 	/// ```rust
-	/// use lofty::config::{apply_global_options, GlobalOptions};
+	/// use lofty::config::{GlobalOptions, apply_global_options};
 	///
 	/// // I'm just reading tags, I don't need to preserve format-specific items
 	/// let global_options = GlobalOptions::new().preserve_format_specific_items(false);
@@ -136,7 +136,7 @@ impl Default for GlobalOptions {
 /// # Examples
 ///
 /// ```rust
-/// use lofty::config::{apply_global_options, GlobalOptions};
+/// use lofty::config::{GlobalOptions, apply_global_options};
 ///
 /// // I have a custom resolver that I need checked
 /// let global_options = GlobalOptions::new().use_custom_resolvers(true);

lofty/src/config/mod.rs

@@ -4,7 +4,7 @@ mod global_options;
 mod parse_options;
 mod write_options;
 
-pub use global_options::{apply_global_options, GlobalOptions};
+pub use global_options::{GlobalOptions, apply_global_options};
 pub use parse_options::{ParseOptions, ParsingMode};
 pub use write_options::WriteOptions;
 

lofty/src/flac/read.rs

@@ -1,11 +1,11 @@
+use super::FlacFile;
 use super::block::Block;
 use super::properties::FlacProperties;
-use super::FlacFile;
 use crate::config::{ParseOptions, ParsingMode};
 use crate::error::Result;
 use crate::flac::block::{BLOCK_ID_PICTURE, BLOCK_ID_STREAMINFO, BLOCK_ID_VORBIS_COMMENTS};
 use crate::id3::v2::read::parse_id3v2;
-use crate::id3::{find_id3v2, FindId3v2Config, ID3FindResults};
+use crate::id3::{FindId3v2Config, ID3FindResults, find_id3v2};
 use crate::macros::{decode_err, err};
 use crate::ogg::read::read_comments;
 use crate::picture::Picture;