From 90ae5b8e54356a35e266fb24e969aafbcb26e990 Mon Sep 17 00:00:00 2001 From: Jonathan Behrens Date: Sat, 23 Mar 2024 13:51:28 -0700 Subject: [PATCH] Fix warnings (#225) --- src/decoder/ifd.rs | 1 - src/decoder/image.rs | 1 - src/decoder/mod.rs | 1 - src/decoder/stream.rs | 1 - src/decoder/tag_reader.rs | 1 - src/encoder/compression/deflate.rs | 3 +-- src/encoder/compression/lzw.rs | 3 +-- src/encoder/compression/packbits.rs | 4 ++-- src/encoder/compression/uncompressed.rs | 3 +-- src/encoder/mod.rs | 1 - 10 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/decoder/ifd.rs b/src/decoder/ifd.rs index ecba47f..55775a0 100644 --- a/src/decoder/ifd.rs +++ b/src/decoder/ifd.rs @@ -1,7 +1,6 @@ //! Function for reading TIFF tags use std::collections::HashMap; -use std::convert::{TryFrom, TryInto}; use std::io::{self, Read, Seek}; use std::mem; use std::str; diff --git a/src/decoder/image.rs b/src/decoder/image.rs index 731c8fb..4a1d881 100644 --- a/src/decoder/image.rs +++ b/src/decoder/image.rs @@ -7,7 +7,6 @@ use crate::tags::{ CompressionMethod, PhotometricInterpretation, PlanarConfiguration, Predictor, SampleFormat, Tag, }; use crate::{ColorType, TiffError, TiffFormatError, TiffResult, TiffUnsupportedError, UsageError}; -use std::convert::TryFrom; use std::io::{self, Cursor, Read, Seek}; use std::sync::Arc; diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs index ccdacf7..574caff 100644 --- a/src/decoder/mod.rs +++ b/src/decoder/mod.rs @@ -1,5 +1,4 @@ use std::collections::{HashMap, HashSet}; -use std::convert::TryFrom; use std::io::{self, Read, Seek}; use std::ops::Range; diff --git a/src/decoder/stream.rs b/src/decoder/stream.rs index 978f0e7..8a995b0 100644 --- a/src/decoder/stream.rs +++ b/src/decoder/stream.rs @@ -1,6 +1,5 @@ //! All IO functionality needed for TIFF decoding -use std::convert::TryFrom; use std::io::{self, BufRead, BufReader, Read, Seek, Take}; /// Byte order of the TIFF file. diff --git a/src/decoder/tag_reader.rs b/src/decoder/tag_reader.rs index 837da40..3ae2d17 100644 --- a/src/decoder/tag_reader.rs +++ b/src/decoder/tag_reader.rs @@ -1,4 +1,3 @@ -use std::convert::TryFrom; use std::io::{Read, Seek}; use crate::tags::Tag; diff --git a/src/encoder/compression/deflate.rs b/src/encoder/compression/deflate.rs index ce34d46..a8a052e 100644 --- a/src/encoder/compression/deflate.rs +++ b/src/encoder/compression/deflate.rs @@ -1,6 +1,5 @@ -use crate::{encoder::compression::*, tags::CompressionMethod}; +use crate::encoder::compression::*; use flate2::{write::ZlibEncoder, Compression as FlateCompression}; -use std::io::Write; /// The Deflate algorithm used to compress image data in TIFF files. #[derive(Debug, Clone, Copy)] diff --git a/src/encoder/compression/lzw.rs b/src/encoder/compression/lzw.rs index d43e904..e62e04f 100644 --- a/src/encoder/compression/lzw.rs +++ b/src/encoder/compression/lzw.rs @@ -1,5 +1,4 @@ -use crate::{encoder::compression::*, tags::CompressionMethod}; -use std::io::Write; +use crate::encoder::compression::*; use weezl::encode::Encoder as LZWEncoder; /// The LZW algorithm used to compress image data in TIFF files. diff --git a/src/encoder/compression/packbits.rs b/src/encoder/compression/packbits.rs index 516863f..39cad88 100644 --- a/src/encoder/compression/packbits.rs +++ b/src/encoder/compression/packbits.rs @@ -1,5 +1,5 @@ -use crate::{encoder::compression::*, tags::CompressionMethod}; -use std::io::{BufWriter, Error, ErrorKind, Write}; +use crate::encoder::compression::*; +use std::io::{BufWriter, Error, ErrorKind}; /// Compressor that uses the Packbits[^note] algorithm to compress bytes. /// diff --git a/src/encoder/compression/uncompressed.rs b/src/encoder/compression/uncompressed.rs index 2555d15..f414403 100644 --- a/src/encoder/compression/uncompressed.rs +++ b/src/encoder/compression/uncompressed.rs @@ -1,5 +1,4 @@ -use crate::{encoder::compression::*, tags::CompressionMethod}; -use std::io::Write; +use crate::encoder::compression::*; /// The default algorithm which does not compress at all. #[derive(Debug, Clone, Copy, PartialEq, Eq, Default)] diff --git a/src/encoder/mod.rs b/src/encoder/mod.rs index ddb9487..152a77a 100644 --- a/src/encoder/mod.rs +++ b/src/encoder/mod.rs @@ -3,7 +3,6 @@ pub use tiff_value::*; use std::{ cmp, collections::BTreeMap, - convert::{TryFrom, TryInto}, io::{self, Seek, Write}, marker::PhantomData, mem,