cargo fmt

This commit is contained in:
Chris Hennick 2024-02-28 16:28:41 -08:00
parent 007918a81f
commit c48b5a558b
2 changed files with 12 additions and 9 deletions

View file

@ -6,13 +6,6 @@ use crate::result::{ZipError, ZipResult};
use crate::spec; use crate::spec;
use crate::types::{ffi, AtomicU64, DateTime, System, ZipFileData, DEFAULT_VERSION}; use crate::types::{ffi, AtomicU64, DateTime, System, ZipFileData, DEFAULT_VERSION};
use byteorder::{LittleEndian, WriteBytesExt}; use byteorder::{LittleEndian, WriteBytesExt};
use crc32fast::Hasher;
use std::collections::HashMap;
use std::default::Default;
use std::io;
use std::io::prelude::*;
use std::io::{BufReader, SeekFrom};
use std::mem;
#[cfg(any( #[cfg(any(
feature = "deflate", feature = "deflate",
feature = "deflate-miniz", feature = "deflate-miniz",
@ -23,6 +16,13 @@ use std::mem;
feature = "zstd", feature = "zstd",
))] ))]
use core::num::NonZeroU64; use core::num::NonZeroU64;
use crc32fast::Hasher;
use std::collections::HashMap;
use std::default::Default;
use std::io;
use std::io::prelude::*;
use std::io::{BufReader, SeekFrom};
use std::mem;
use std::str::{from_utf8, Utf8Error}; use std::str::{from_utf8, Utf8Error};
use std::sync::Arc; use std::sync::Arc;
@ -1419,7 +1419,10 @@ fn bzip2_compression_level_range() -> std::ops::RangeInclusive<i64> {
feature = "bzip2", feature = "bzip2",
feature = "zstd" feature = "zstd"
))] ))]
fn clamp_opt<T: Ord + Copy, U: Ord + Copy + TryFrom<T>>(value: T, range: std::ops::RangeInclusive<U>) -> Option<T> { fn clamp_opt<T: Ord + Copy, U: Ord + Copy + TryFrom<T>>(
value: T,
range: std::ops::RangeInclusive<U>,
) -> Option<T> {
if range.contains(&value.try_into().ok()?) { if range.contains(&value.try_into().ok()?) {
Some(value) Some(value)
} else { } else {

View file

@ -1,7 +1,7 @@
use byteorder::{LittleEndian, WriteBytesExt}; use byteorder::{LittleEndian, WriteBytesExt};
use std::collections::HashSet; use std::collections::HashSet;
use std::io::prelude::*; use std::io::prelude::*;
use std::io::{Cursor}; use std::io::Cursor;
use zip_next::result::ZipResult; use zip_next::result::ZipResult;
use zip_next::write::FileOptions; use zip_next::write::FileOptions;
use zip_next::{CompressionMethod, ZipWriter, SUPPORTED_COMPRESSION_METHODS}; use zip_next::{CompressionMethod, ZipWriter, SUPPORTED_COMPRESSION_METHODS};