From 86e60459e041a961d7f24375ccf085e379286809 Mon Sep 17 00:00:00 2001 From: FreezyLemon Date: Sun, 25 Feb 2024 12:15:50 +0100 Subject: [PATCH] Remove redundant imports These result in warnings in Rust 1.78 --- src/asm/shared/dist/sse.rs | 1 - src/asm/shared/transform/inverse.rs | 1 - src/asm/x86/cdef.rs | 1 - src/asm/x86/quantize.rs | 1 - src/bin/common.rs | 1 - src/bin/decoder/y4m.rs | 1 - src/bin/stats.rs | 2 -- src/context/block_unit.rs | 1 - src/context/partition_unit.rs | 1 - src/encoder.rs | 1 - src/predict.rs | 10 +--------- src/quantize/mod.rs | 1 - src/rdo.rs | 1 - src/sad_plane.rs | 1 - src/transform/inverse.rs | 1 - 15 files changed, 1 insertion(+), 24 deletions(-) diff --git a/src/asm/shared/dist/sse.rs b/src/asm/shared/dist/sse.rs index 989cbf37db..73376aff28 100644 --- a/src/asm/shared/dist/sse.rs +++ b/src/asm/shared/dist/sse.rs @@ -10,7 +10,6 @@ #[cfg(test)] pub mod test { use crate::config::CpuFeatureLevel; - use crate::dist::rust; use crate::dist::*; use crate::frame::*; use crate::partition::BlockSize; diff --git a/src/asm/shared/transform/inverse.rs b/src/asm/shared/transform/inverse.rs index 1f0e803614..5b60bf497e 100644 --- a/src/asm/shared/transform/inverse.rs +++ b/src/asm/shared/transform/inverse.rs @@ -86,7 +86,6 @@ pub mod test { use crate::transform::TxSize::*; use crate::transform::*; use rand::{random, thread_rng, Rng}; - use std::mem::MaybeUninit; pub fn pick_eob( coeffs: &mut [T], tx_size: TxSize, tx_type: TxType, sub_h: usize, diff --git a/src/asm/x86/cdef.rs b/src/asm/x86/cdef.rs index 9ac9a62b8f..d88b6c7d64 100644 --- a/src/asm/x86/cdef.rs +++ b/src/asm/x86/cdef.rs @@ -293,7 +293,6 @@ cpu_function_lookup_table!( mod test { pub const CDEF_HAVE_NONE: u8 = 0; use super::*; - use crate::frame::{AsRegion, Plane}; use interpolate_name::interpolate_test; use rand::random; use std::str::FromStr; diff --git a/src/asm/x86/quantize.rs b/src/asm/x86/quantize.rs index 8394630f55..df003e34ec 100644 --- a/src/asm/x86/quantize.rs +++ b/src/asm/x86/quantize.rs @@ -160,7 +160,6 @@ mod test { use super::*; use rand::distributions::{Distribution, Uniform}; use rand::{thread_rng, Rng}; - use std::mem::MaybeUninit; #[test] fn dequantize_test() { diff --git a/src/bin/common.rs b/src/bin/common.rs index 8283f8acad..f2764e9ac8 100644 --- a/src/bin/common.rs +++ b/src/bin/common.rs @@ -10,7 +10,6 @@ use crate::error::*; use crate::muxer::{create_muxer, Muxer}; use crate::stats::MetricsEnabled; -use crate::{ColorPrimaries, MatrixCoefficients, TransferCharacteristics}; use clap::{CommandFactory, Parser as Clap, Subcommand}; use clap_complete::{generate, Shell}; use rav1e::prelude::*; diff --git a/src/bin/decoder/y4m.rs b/src/bin/decoder/y4m.rs index 6fac698c6d..667d7ae05b 100644 --- a/src/bin/decoder/y4m.rs +++ b/src/bin/decoder/y4m.rs @@ -12,7 +12,6 @@ use std::io::Read; use crate::color::ChromaSampling::Cs400; use crate::decoder::{DecodeError, Decoder, FrameBuilder, VideoDetails}; -use crate::Frame; use rav1e::prelude::*; impl Decoder for y4m::Decoder> { diff --git a/src/bin/stats.rs b/src/bin/stats.rs index 548556bc15..ea41e11ca2 100644 --- a/src/bin/stats.rs +++ b/src/bin/stats.rs @@ -9,9 +9,7 @@ use av_metrics::video::*; use rav1e::data::EncoderStats; -use rav1e::prelude::Rational; use rav1e::prelude::*; -use rav1e::{Packet, Pixel}; use std::fmt; use std::time::Instant; diff --git a/src/context/block_unit.rs b/src/context/block_unit.rs index f68bc9c9f3..fc8ff0185e 100644 --- a/src/context/block_unit.rs +++ b/src/context/block_unit.rs @@ -12,7 +12,6 @@ use std::mem::MaybeUninit; use super::*; use crate::predict::PredictionMode; -use crate::util::cdf; pub const MAX_PLANES: usize = 3; diff --git a/src/context/partition_unit.rs b/src/context/partition_unit.rs index a4d410fc25..8a8b3f2753 100644 --- a/src/context/partition_unit.rs +++ b/src/context/partition_unit.rs @@ -7,7 +7,6 @@ // Media Patent License 1.0 was not distributed with this source code in the // PATENTS file, you can obtain it at www.aomedia.org/license/patent. -use super::cdf_context::ContextWriter; use super::*; // Generates 4 bit field in which each bit set to 1 represents diff --git a/src/encoder.rs b/src/encoder.rs index 357ebf1e39..5d2cb1de19 100644 --- a/src/encoder.rs +++ b/src/encoder.rs @@ -8,7 +8,6 @@ // PATENTS file, you can obtain it at www.aomedia.org/license/patent. use crate::activity::*; -use crate::api::config::GrainTableSegment; use crate::api::*; use crate::cdef::*; use crate::context::*; diff --git a/src/predict.rs b/src/predict.rs index 6c2f726c6d..71894a1bf6 100644 --- a/src/predict.rs +++ b/src/predict.rs @@ -32,7 +32,6 @@ use crate::partition::*; use crate::tiling::*; use crate::transform::*; use crate::util::*; -use std::convert::TryInto; pub const ANGLE_STEP: i8 = 3; @@ -698,13 +697,7 @@ pub fn luma_ac<'ac, T: Pixel>( pub(crate) mod rust { use super::*; - use crate::context::MAX_TX_SIZE; - use crate::cpu_features::CpuFeatureLevel; - use crate::tiling::PlaneRegionMut; - use crate::transform::TxSize; - use crate::util::round_shift; - use crate::Pixel; - use std::mem::{size_of, MaybeUninit}; + use std::mem::size_of; #[inline(always)] pub fn dispatch_predict_intra( @@ -1514,7 +1507,6 @@ pub(crate) mod rust { mod test { use super::*; use crate::predict::rust::*; - use crate::util::Aligned; use num_traits::*; #[test] diff --git a/src/quantize/mod.rs b/src/quantize/mod.rs index d9b55c3072..0501915613 100644 --- a/src/quantize/mod.rs +++ b/src/quantize/mod.rs @@ -24,7 +24,6 @@ pub use tables::*; use crate::scan_order::av1_scan_orders; use crate::transform::{TxSize, TxType}; use crate::util::*; -use std::convert::Into; use std::mem; use std::num::{NonZeroU16, NonZeroU32, NonZeroU64}; diff --git a/src/rdo.rs b/src/rdo.rs index b86ba7bded..bc08e40614 100644 --- a/src/rdo.rs +++ b/src/rdo.rs @@ -19,7 +19,6 @@ use crate::dist::*; use crate::ec::{Writer, WriterCounter, OD_BITRES}; use crate::encode_block_with_modes; use crate::encoder::{FrameInvariants, IMPORTANCE_BLOCK_SIZE}; -use crate::frame::Frame; use crate::frame::*; use crate::header::ReferenceMode; use crate::lrf::*; diff --git a/src/sad_plane.rs b/src/sad_plane.rs index b8f59e673b..8f68da92f8 100644 --- a/src/sad_plane.rs +++ b/src/sad_plane.rs @@ -22,7 +22,6 @@ use crate::util::{CastFromPrimitive, Pixel}; pub(crate) mod rust { use super::*; - use crate::cpu_features::CpuFeatureLevel; #[inline] pub(crate) fn sad_plane_internal( diff --git a/src/transform/inverse.rs b/src/transform/inverse.rs index 675ae23194..737edf3d4f 100644 --- a/src/transform/inverse.rs +++ b/src/transform/inverse.rs @@ -1626,7 +1626,6 @@ static INV_TXFM_FNS: [[InvTxfmFn; 5]; 5] = [ pub(crate) mod rust { use super::*; use crate::cpu_features::CpuFeatureLevel; - use crate::util::clamp; use simd_helpers::cold_for_target_arch; use std::cmp;