From cdfe4b3d67039af6ce696d1d16bfdd6f11761b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 31 Oct 2021 18:00:02 +0200 Subject: [PATCH] Remove unneeded std::convert::TryFrom/TryInto and std::str::FromStr imports --- examples/src/bin/queries.rs | 1 - gstreamer-audio/src/audio_converter.rs | 5 ++--- gstreamer-audio/src/audio_meta.rs | 2 -- gstreamer-base/src/base_parse.rs | 1 - gstreamer-base/src/base_parse_frame.rs | 1 - gstreamer-base/src/subclass/base_parse.rs | 1 - gstreamer-video/src/video_converter.rs | 5 ++--- gstreamer-video/src/video_hdr.rs | 1 - gstreamer-video/src/video_info.rs | 6 ++---- gstreamer-video/src/video_time_code.rs | 3 --- gstreamer/src/clock.rs | 5 ++--- gstreamer/src/clock_time.rs | 1 - gstreamer/src/date_time.rs | 5 ++--- gstreamer/src/date_time_serde.rs | 2 -- gstreamer/src/format.rs | 1 - gstreamer/src/format_serde.rs | 1 - gstreamer/src/query.rs | 1 - gstreamer/src/structure.rs | 5 ++--- 18 files changed, 12 insertions(+), 35 deletions(-) diff --git a/examples/src/bin/queries.rs b/examples/src/bin/queries.rs index 505e72381..e9cd417d4 100644 --- a/examples/src/bin/queries.rs +++ b/examples/src/bin/queries.rs @@ -14,7 +14,6 @@ use gst::prelude::*; -use std::convert::TryInto; use std::env; #[path = "../examples-common.rs"] diff --git a/gstreamer-audio/src/audio_converter.rs b/gstreamer-audio/src/audio_converter.rs index cb36b7399..cb24a79be 100644 --- a/gstreamer-audio/src/audio_converter.rs +++ b/gstreamer-audio/src/audio_converter.rs @@ -2,7 +2,6 @@ use glib::prelude::*; -use std::convert; use std::ops; #[derive(Debug, Clone, PartialEq, Eq)] @@ -40,7 +39,7 @@ impl Default for AudioConverterConfig { } } -impl convert::TryFrom for AudioConverterConfig { +impl TryFrom for AudioConverterConfig { type Error = glib::BoolError; fn try_from(v: gst::Structure) -> Result { @@ -53,7 +52,7 @@ impl convert::TryFrom for AudioConverterConfig { } } -impl<'a> convert::TryFrom<&'a gst::StructureRef> for AudioConverterConfig { +impl<'a> TryFrom<&'a gst::StructureRef> for AudioConverterConfig { type Error = glib::BoolError; fn try_from(v: &'a gst::StructureRef) -> Result { diff --git a/gstreamer-audio/src/audio_meta.rs b/gstreamer-audio/src/audio_meta.rs index 07dc051d9..75037adea 100644 --- a/gstreamer-audio/src/audio_meta.rs +++ b/gstreamer-audio/src/audio_meta.rs @@ -292,8 +292,6 @@ mod tests { #[test] fn test_add_get_audio_clipping_meta() { - use std::convert::TryInto; - gst::init().unwrap(); let mut buffer = gst::Buffer::with_size(1024).unwrap(); diff --git a/gstreamer-base/src/base_parse.rs b/gstreamer-base/src/base_parse.rs index e014eb4ba..08545a3c2 100644 --- a/gstreamer-base/src/base_parse.rs +++ b/gstreamer-base/src/base_parse.rs @@ -5,7 +5,6 @@ use crate::BaseParseFrame; use glib::prelude::*; use glib::translate::*; use gst::FormattedValue; -use std::convert::TryFrom; use std::mem; pub trait BaseParseExtManual: 'static { diff --git a/gstreamer-base/src/base_parse_frame.rs b/gstreamer-base/src/base_parse_frame.rs index 70eb124e0..3849eb766 100644 --- a/gstreamer-base/src/base_parse_frame.rs +++ b/gstreamer-base/src/base_parse_frame.rs @@ -1,7 +1,6 @@ // Take a look at the license at the top of the repository in the LICENSE file. use glib::translate::*; -use std::convert::TryFrom; use std::fmt; use std::marker::PhantomData; use std::ptr; diff --git a/gstreamer-base/src/subclass/base_parse.rs b/gstreamer-base/src/subclass/base_parse.rs index 02d6efa60..f3f12d8f9 100644 --- a/gstreamer-base/src/subclass/base_parse.rs +++ b/gstreamer-base/src/subclass/base_parse.rs @@ -1,6 +1,5 @@ // Take a look at the license at the top of the repository in the LICENSE file. -use std::convert::TryFrom; use std::mem; use crate::prelude::*; diff --git a/gstreamer-video/src/video_converter.rs b/gstreamer-video/src/video_converter.rs index 08ca45e80..a88d5546d 100644 --- a/gstreamer-video/src/video_converter.rs +++ b/gstreamer-video/src/video_converter.rs @@ -2,7 +2,6 @@ use glib::translate::ToGlibPtr; -use std::convert; use std::ops; use std::ptr; @@ -128,7 +127,7 @@ impl Default for VideoConverterConfig { } } -impl convert::TryFrom for VideoConverterConfig { +impl TryFrom for VideoConverterConfig { type Error = glib::BoolError; fn try_from(v: gst::Structure) -> Result { @@ -141,7 +140,7 @@ impl convert::TryFrom for VideoConverterConfig { } } -impl<'a> convert::TryFrom<&'a gst::StructureRef> for VideoConverterConfig { +impl<'a> TryFrom<&'a gst::StructureRef> for VideoConverterConfig { type Error = glib::BoolError; fn try_from(v: &'a gst::StructureRef) -> Result { diff --git a/gstreamer-video/src/video_hdr.rs b/gstreamer-video/src/video_hdr.rs index e07c689ec..eb7fcfb42 100644 --- a/gstreamer-video/src/video_hdr.rs +++ b/gstreamer-video/src/video_hdr.rs @@ -2,7 +2,6 @@ use glib::translate::*; -use std::convert::TryFrom; use std::fmt; use std::mem; use std::ptr; diff --git a/gstreamer-video/src/video_info.rs b/gstreamer-video/src/video_info.rs index 28339736e..26d99e09e 100644 --- a/gstreamer-video/src/video_info.rs +++ b/gstreamer-video/src/video_info.rs @@ -222,7 +222,7 @@ impl From for crate::VideoMultiviewMode { } } -impl std::convert::TryFrom for crate::VideoMultiviewFramePacking { +impl TryFrom for crate::VideoMultiviewFramePacking { type Error = glib::BoolError; fn try_from(v: crate::VideoMultiviewMode) -> Result { @@ -1122,11 +1122,9 @@ mod tests { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))] #[test] fn test_display() { - use std::str::FromStr; - gst::init().unwrap(); - format!("{}", crate::VideoColorimetry::from_str("sRGB").unwrap()); + format!("{}", "sRGB".parse::().unwrap()); format!("{}", crate::VideoFieldOrder::TopFieldFirst); format!("{}", crate::VideoInterlaceMode::Progressive); } diff --git a/gstreamer-video/src/video_time_code.rs b/gstreamer-video/src/video_time_code.rs index f0ca8019c..c9e6cb71c 100644 --- a/gstreamer-video/src/video_time_code.rs +++ b/gstreamer-video/src/video_time_code.rs @@ -3,7 +3,6 @@ use glib::translate::*; use gst::prelude::*; use std::cmp; -use std::convert::{TryFrom, TryInto}; use std::fmt; use std::mem; use std::ptr; @@ -607,8 +606,6 @@ impl fmt::Debug for VideoTimeCodeMeta { #[cfg(feature = "v1_16")] #[cfg(test)] mod tests { - use super::*; - #[test] fn test_add_get_set_meta() { gst::init().unwrap(); diff --git a/gstreamer/src/clock.rs b/gstreamer/src/clock.rs index 17130c5bc..c2b9368d8 100644 --- a/gstreamer/src/clock.rs +++ b/gstreamer/src/clock.rs @@ -13,7 +13,6 @@ use glib::prelude::*; use glib::translate::*; use libc::c_void; use std::cmp; -use std::convert; use std::ptr; use futures_core::{Future, Stream}; @@ -118,7 +117,7 @@ impl From for ClockId { } } -impl convert::TryFrom for SingleShotClockId { +impl TryFrom for SingleShotClockId { type Error = glib::BoolError; fn try_from(id: ClockId) -> Result { @@ -228,7 +227,7 @@ impl From for ClockId { } } -impl convert::TryFrom for PeriodicClockId { +impl TryFrom for PeriodicClockId { type Error = glib::BoolError; fn try_from(id: ClockId) -> Result { diff --git a/gstreamer/src/clock_time.rs b/gstreamer/src/clock_time.rs index fefbc68e5..62808ceb1 100644 --- a/gstreamer/src/clock_time.rs +++ b/gstreamer/src/clock_time.rs @@ -6,7 +6,6 @@ use muldiv::MulDiv; use num_integer::div_rem; use opt_ops::prelude::*; use std::borrow::Borrow; -use std::convert::{From, TryFrom}; use std::io::{self, prelude::*}; use std::ops; use std::time::Duration; diff --git a/gstreamer/src/date_time.rs b/gstreamer/src/date_time.rs index 513eb7435..5b34b0f12 100644 --- a/gstreamer/src/date_time.rs +++ b/gstreamer/src/date_time.rs @@ -2,7 +2,6 @@ use glib::translate::*; use std::cmp; -use std::convert; use std::fmt; use crate::DateTime; @@ -514,7 +513,7 @@ impl From for DateTime { } } -impl<'a> convert::TryFrom<&'a DateTime> for glib::DateTime { +impl<'a> TryFrom<&'a DateTime> for glib::DateTime { type Error = glib::BoolError; fn try_from(v: &'a DateTime) -> Result { @@ -523,7 +522,7 @@ impl<'a> convert::TryFrom<&'a DateTime> for glib::DateTime { } } -impl convert::TryFrom for glib::DateTime { +impl TryFrom for glib::DateTime { type Error = glib::BoolError; fn try_from(v: DateTime) -> Result { diff --git a/gstreamer/src/date_time_serde.rs b/gstreamer/src/date_time_serde.rs index 2af098aa6..8cc688e7f 100644 --- a/gstreamer/src/date_time_serde.rs +++ b/gstreamer/src/date_time_serde.rs @@ -2,8 +2,6 @@ #![allow(clippy::upper_case_acronyms)] -use std::convert::{TryFrom, TryInto}; - use glib::translate::{FromGlib, IntoGlib}; use glib::value::{ToValue, ToValueOptional}; use glib::StaticType; diff --git a/gstreamer/src/format.rs b/gstreamer/src/format.rs index 59e357379..513b553e7 100644 --- a/gstreamer/src/format.rs +++ b/gstreamer/src/format.rs @@ -6,7 +6,6 @@ use glib::translate::{FromGlib, GlibNoneError, IntoGlib, OptionIntoGlib, TryFrom use muldiv::MulDiv; use opt_ops::prelude::*; use std::borrow::Borrow; -use std::convert::TryFrom; use std::fmt; use std::ops; use thiserror::Error; diff --git a/gstreamer/src/format_serde.rs b/gstreamer/src/format_serde.rs index 2b89d2b13..931797077 100644 --- a/gstreamer/src/format_serde.rs +++ b/gstreamer/src/format_serde.rs @@ -61,7 +61,6 @@ mod tests { use crate::ClockTime; use crate::Format; use crate::GenericFormattedValue; - use std::convert::TryFrom; #[test] fn test_serialize() { diff --git a/gstreamer/src/query.rs b/gstreamer/src/query.rs index 902474f27..52a3cc009 100644 --- a/gstreamer/src/query.rs +++ b/gstreamer/src/query.rs @@ -1506,7 +1506,6 @@ declare_concrete_query!(Other, T); mod tests { use super::*; use crate::ClockTime; - use std::convert::TryInto; #[test] fn test_writability() { diff --git a/gstreamer/src/structure.rs b/gstreamer/src/structure.rs index 226924505..6f1e04356 100644 --- a/gstreamer/src/structure.rs +++ b/gstreamer/src/structure.rs @@ -889,7 +889,6 @@ impl Builder { #[cfg(test)] mod tests { use super::*; - use std::str::FromStr; #[test] fn new_set_get() { @@ -969,7 +968,7 @@ mod tests { let a = "Test, f1=(string)abc, f2=(uint)123;"; - let s = Structure::from_str(a).unwrap(); + let s = a.parse::().unwrap(); assert_eq!(s.get::<&str>("f1"), Ok("abc")); assert_eq!(s.get::("f2"), Ok(123)); @@ -984,7 +983,7 @@ mod tests { let a = None::<&Structure>.to_value(); assert!(a.get::>().unwrap().is_none()); - let b = Structure::from_str("foo").unwrap().to_value(); + let b = "foo".parse::().unwrap().to_value(); assert!(b.get::>().unwrap().is_some()); }