From ea59f4c7525d7a4759ca428123a0220c5b2d1bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6nig?= Date: Sun, 31 Mar 2024 16:33:28 +0000 Subject: [PATCH] Fix redundant import checking on beta toolchain MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christian König --- connect/src/spirc.rs | 3 +-- core/src/cdn_url.rs | 5 +---- core/src/connection/handshake.rs | 2 +- core/src/connection/mod.rs | 2 +- core/src/date.rs | 2 +- core/src/spotify_id.rs | 1 - metadata/src/album.rs | 1 - metadata/src/artist.rs | 1 - metadata/src/availability.rs | 1 - metadata/src/episode.rs | 1 - metadata/src/image.rs | 1 - metadata/src/playlist/annotation.rs | 1 - metadata/src/playlist/attribute.rs | 1 - metadata/src/playlist/diff.rs | 2 +- metadata/src/playlist/item.rs | 1 - metadata/src/playlist/list.rs | 1 - metadata/src/playlist/operation.rs | 1 - metadata/src/sale_period.rs | 1 - metadata/src/show.rs | 5 +---- metadata/src/track.rs | 1 - 20 files changed, 7 insertions(+), 27 deletions(-) diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index e7880469e..200c3f830 100644 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -1,5 +1,4 @@ use std::{ - convert::TryFrom, future::Future, pin::Pin, sync::atomic::{AtomicUsize, Ordering}, @@ -9,7 +8,7 @@ use std::{ use futures_util::{stream::FusedStream, FutureExt, StreamExt}; -use protobuf::{self, Message}; +use protobuf::Message; use rand::prelude::SliceRandom; use thiserror::Error; use tokio::sync::mpsc; diff --git a/core/src/cdn_url.rs b/core/src/cdn_url.rs index 417a3c73e..5a80528eb 100644 --- a/core/src/cdn_url.rs +++ b/core/src/cdn_url.rs @@ -1,7 +1,4 @@ -use std::{ - convert::TryFrom, - ops::{Deref, DerefMut}, -}; +use std::ops::{Deref, DerefMut}; use protobuf::Message; use thiserror::Error; diff --git a/core/src/connection/handshake.rs b/core/src/connection/handshake.rs index 9f4f39c08..d18f3df1d 100644 --- a/core/src/connection/handshake.rs +++ b/core/src/connection/handshake.rs @@ -2,7 +2,7 @@ use std::{env::consts::ARCH, io}; use byteorder::{BigEndian, ByteOrder, WriteBytesExt}; use hmac::{Hmac, Mac}; -use protobuf::{self, Message}; +use protobuf::Message; use rand::{thread_rng, RngCore}; use rsa::{BigUint, Pkcs1v15Sign, RsaPublicKey}; use sha1::{Digest, Sha1}; diff --git a/core/src/connection/mod.rs b/core/src/connection/mod.rs index e7aa16930..4bac6e3e3 100644 --- a/core/src/connection/mod.rs +++ b/core/src/connection/mod.rs @@ -7,7 +7,7 @@ use std::io; use futures_util::{SinkExt, StreamExt}; use num_traits::FromPrimitive; -use protobuf::{self, Message}; +use protobuf::Message; use thiserror::Error; use tokio::net::TcpStream; use tokio_util::codec::Framed; diff --git a/core/src/date.rs b/core/src/date.rs index 5f08d4e87..ddcaf3206 100644 --- a/core/src/date.rs +++ b/core/src/date.rs @@ -1,4 +1,4 @@ -use std::{convert::TryFrom, fmt::Debug, ops::Deref}; +use std::{fmt::Debug, ops::Deref}; use time::{ error::ComponentRange, format_description::well_known::Iso8601, Date as _Date, OffsetDateTime, diff --git a/core/src/spotify_id.rs b/core/src/spotify_id.rs index 93b0b8f63..81f00da5f 100644 --- a/core/src/spotify_id.rs +++ b/core/src/spotify_id.rs @@ -1,5 +1,4 @@ use std::{ - convert::{TryFrom, TryInto}, fmt, ops::Deref, }; diff --git a/metadata/src/album.rs b/metadata/src/album.rs index 8b33571eb..ede9cc5b4 100644 --- a/metadata/src/album.rs +++ b/metadata/src/album.rs @@ -1,5 +1,4 @@ use std::{ - convert::{TryFrom, TryInto}, fmt::Debug, ops::{Deref, DerefMut}, }; diff --git a/metadata/src/artist.rs b/metadata/src/artist.rs index b06b22bce..927846a39 100644 --- a/metadata/src/artist.rs +++ b/metadata/src/artist.rs @@ -1,5 +1,4 @@ use std::{ - convert::{TryFrom, TryInto}, fmt::Debug, ops::{Deref, DerefMut}, }; diff --git a/metadata/src/availability.rs b/metadata/src/availability.rs index 6713da287..7ee84cf1b 100644 --- a/metadata/src/availability.rs +++ b/metadata/src/availability.rs @@ -1,5 +1,4 @@ use std::{ - convert::TryFrom, fmt::Debug, ops::{Deref, DerefMut}, }; diff --git a/metadata/src/episode.rs b/metadata/src/episode.rs index 8e200802b..dcdde70d3 100644 --- a/metadata/src/episode.rs +++ b/metadata/src/episode.rs @@ -1,5 +1,4 @@ use std::{ - convert::{TryFrom, TryInto}, fmt::Debug, ops::{Deref, DerefMut}, }; diff --git a/metadata/src/image.rs b/metadata/src/image.rs index be0137e7a..97f1ccb80 100644 --- a/metadata/src/image.rs +++ b/metadata/src/image.rs @@ -1,5 +1,4 @@ use std::{ - convert::{TryFrom, TryInto}, fmt::Debug, ops::{Deref, DerefMut}, }; diff --git a/metadata/src/playlist/annotation.rs b/metadata/src/playlist/annotation.rs index d73f7b937..a21b98049 100644 --- a/metadata/src/playlist/annotation.rs +++ b/metadata/src/playlist/annotation.rs @@ -1,4 +1,3 @@ -use std::convert::TryFrom; use std::fmt::Debug; use protobuf::Message; diff --git a/metadata/src/playlist/attribute.rs b/metadata/src/playlist/attribute.rs index 6da2be831..86a8f6c55 100644 --- a/metadata/src/playlist/attribute.rs +++ b/metadata/src/playlist/attribute.rs @@ -1,6 +1,5 @@ use std::{ collections::HashMap, - convert::TryFrom, fmt::Debug, ops::{Deref, DerefMut}, }; diff --git a/metadata/src/playlist/diff.rs b/metadata/src/playlist/diff.rs index c4967d85d..d47578c0b 100644 --- a/metadata/src/playlist/diff.rs +++ b/metadata/src/playlist/diff.rs @@ -1,4 +1,4 @@ -use std::{convert::TryFrom, fmt::Debug}; +use std::fmt::Debug; use super::operation::PlaylistOperations; diff --git a/metadata/src/playlist/item.rs b/metadata/src/playlist/item.rs index 4fb892c61..8fa5e4bc5 100644 --- a/metadata/src/playlist/item.rs +++ b/metadata/src/playlist/item.rs @@ -1,5 +1,4 @@ use std::{ - convert::{TryFrom, TryInto}, fmt::Debug, ops::{Deref, DerefMut}, }; diff --git a/metadata/src/playlist/list.rs b/metadata/src/playlist/list.rs index b4eaf9b63..b81e61e45 100644 --- a/metadata/src/playlist/list.rs +++ b/metadata/src/playlist/list.rs @@ -1,5 +1,4 @@ use std::{ - convert::{TryFrom, TryInto}, fmt::Debug, ops::{Deref, DerefMut}, }; diff --git a/metadata/src/playlist/operation.rs b/metadata/src/playlist/operation.rs index 5f7c7551b..bcdb54b36 100644 --- a/metadata/src/playlist/operation.rs +++ b/metadata/src/playlist/operation.rs @@ -1,5 +1,4 @@ use std::{ - convert::TryFrom, fmt::Debug, ops::{Deref, DerefMut}, }; diff --git a/metadata/src/sale_period.rs b/metadata/src/sale_period.rs index a9ee317c3..fa8a11834 100644 --- a/metadata/src/sale_period.rs +++ b/metadata/src/sale_period.rs @@ -1,5 +1,4 @@ use std::{ - convert::TryFrom, fmt::Debug, ops::{Deref, DerefMut}, }; diff --git a/metadata/src/show.rs b/metadata/src/show.rs index 5c86856c3..62faa107d 100644 --- a/metadata/src/show.rs +++ b/metadata/src/show.rs @@ -1,7 +1,4 @@ -use std::{ - convert::{TryFrom, TryInto}, - fmt::Debug, -}; +use std::fmt::Debug; use crate::{ availability::Availabilities, copyright::Copyrights, episode::Episodes, image::Images, diff --git a/metadata/src/track.rs b/metadata/src/track.rs index dd945bed5..131cb1b31 100644 --- a/metadata/src/track.rs +++ b/metadata/src/track.rs @@ -1,5 +1,4 @@ use std::{ - convert::{TryFrom, TryInto}, fmt::Debug, ops::{Deref, DerefMut}, };