Use re-exported once_cell

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1268>

31 files changed, 30 insertions, 31 deletions

diff --git a/generic/file/Cargo.toml b/generic/file/Cargo.toml
index 47c0263fe..fdb86ad20 100644
--- a/generic/file/Cargo.toml
+++ b/generic/file/Cargo.toml
@@ -12,7 +12,6 @@ rust-version = "1.66"
 url = "2"
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
-once_cell = "1.0"
 
 [lib]
 name = "gstrsfile"
diff --git a/generic/file/src/filesink/imp.rs b/generic/file/src/filesink/imp.rs
index 64ebc5c48..2628c3be9 100644
--- a/generic/file/src/filesink/imp.rs
+++ b/generic/file/src/filesink/imp.rs
@@ -54,7 +54,7 @@ pub struct FileSink {
     state: Mutex<State>,
 }
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(
         "rsfilesink",
diff --git a/generic/file/src/filesrc/imp.rs b/generic/file/src/filesrc/imp.rs
index 137a2de5d..572de21b7 100644
--- a/generic/file/src/filesrc/imp.rs
+++ b/generic/file/src/filesrc/imp.rs
@@ -54,7 +54,7 @@ pub struct FileSrc {
     state: Mutex<State>,
 }
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(
         "rsfilesrc",
diff --git a/generic/sodium/src/decrypter/imp.rs b/generic/sodium/src/decrypter/imp.rs
index 794e0d5aa..84feb0d45 100644
--- a/generic/sodium/src/decrypter/imp.rs
+++ b/generic/sodium/src/decrypter/imp.rs
@@ -29,7 +29,7 @@ use sodiumoxide::crypto::box_;
 
 use std::sync::Mutex;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(
         "sodiumdecrypter",
diff --git a/generic/sodium/src/encrypter/imp.rs b/generic/sodium/src/encrypter/imp.rs
index b6560e0f7..d0960a264 100644
--- a/generic/sodium/src/encrypter/imp.rs
+++ b/generic/sodium/src/encrypter/imp.rs
@@ -32,7 +32,7 @@ type BufferVec = SmallVec<[gst::Buffer; 16]>;
 
 use std::sync::Mutex;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(
         "sodiumencrypter",
diff --git a/generic/sodium/tests/decrypter.rs b/generic/sodium/tests/decrypter.rs
index a8a154ca2..51666f592 100644
--- a/generic/sodium/tests/decrypter.rs
+++ b/generic/sodium/tests/decrypter.rs
@@ -31,7 +31,7 @@ use std::path::PathBuf;
 
 use pretty_assertions::assert_eq;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 static SENDER_PUBLIC: Lazy<glib::Bytes> = Lazy::new(|| {
     let public = [
         66, 248, 199, 74, 216, 55, 228, 116, 52, 17, 147, 56, 65, 130, 134, 148, 157, 153, 235,
diff --git a/generic/sodium/tests/encrypter.rs b/generic/sodium/tests/encrypter.rs
index e0c18faf9..5607fd89a 100644
--- a/generic/sodium/tests/encrypter.rs
+++ b/generic/sodium/tests/encrypter.rs
@@ -25,7 +25,7 @@
 use gst::glib;
 use gst::prelude::*;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use pretty_assertions::assert_eq;
 
diff --git a/generic/threadshare/examples/benchmark.rs b/generic/threadshare/examples/benchmark.rs
index 7f75c6e9f..0f77ec899 100644
--- a/generic/threadshare/examples/benchmark.rs
+++ b/generic/threadshare/examples/benchmark.rs
@@ -18,8 +18,8 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 use gst::glib;
+use gst::glib::once_cell::sync::Lazy;
 use gst::prelude::*;
-use once_cell::sync::Lazy;
 
 use std::env;
 use std::sync::atomic::{AtomicU64, Ordering};
diff --git a/generic/threadshare/examples/standalone/main.rs b/generic/threadshare/examples/standalone/main.rs
index 1cc43e298..723994e70 100644
--- a/generic/threadshare/examples/standalone/main.rs
+++ b/generic/threadshare/examples/standalone/main.rs
@@ -1,5 +1,5 @@
 use gst::glib;
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 mod args;
 use args::*;
diff --git a/generic/threadshare/examples/standalone/sink/async_mutex/imp.rs b/generic/threadshare/examples/standalone/sink/async_mutex/imp.rs
index 75613181f..faba16137 100644
--- a/generic/threadshare/examples/standalone/sink/async_mutex/imp.rs
+++ b/generic/threadshare/examples/standalone/sink/async_mutex/imp.rs
@@ -14,7 +14,7 @@ use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::EventView;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use gstthreadshare::runtime::executor::block_on_or_add_sub_task;
 use gstthreadshare::runtime::{prelude::*, PadSink};
diff --git a/generic/threadshare/examples/standalone/sink/mod.rs b/generic/threadshare/examples/standalone/sink/mod.rs
index bf9b7aae7..4b3d78de0 100644
--- a/generic/threadshare/examples/standalone/sink/mod.rs
+++ b/generic/threadshare/examples/standalone/sink/mod.rs
@@ -12,7 +12,7 @@ pub const ASYNC_MUTEX_ELEMENT_NAME: &str = "ts-standalone-async-mutex-sink";
 pub const SYNC_MUTEX_ELEMENT_NAME: &str = "ts-standalone-sync-mutex-sink";
 pub const TASK_ELEMENT_NAME: &str = "ts-standalone-task-sink";
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(
         "ts-standalone-sink",
diff --git a/generic/threadshare/examples/standalone/sink/sync_mutex/imp.rs b/generic/threadshare/examples/standalone/sink/sync_mutex/imp.rs
index 18957e402..eab0243ad 100644
--- a/generic/threadshare/examples/standalone/sink/sync_mutex/imp.rs
+++ b/generic/threadshare/examples/standalone/sink/sync_mutex/imp.rs
@@ -14,7 +14,7 @@ use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::EventView;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use gstthreadshare::runtime::{prelude::*, PadSink};
 
diff --git a/generic/threadshare/examples/standalone/sink/task/imp.rs b/generic/threadshare/examples/standalone/sink/task/imp.rs
index 1ac869652..aca3de0a6 100644
--- a/generic/threadshare/examples/standalone/sink/task/imp.rs
+++ b/generic/threadshare/examples/standalone/sink/task/imp.rs
@@ -15,7 +15,7 @@ use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::EventView;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use gstthreadshare::runtime::prelude::*;
 use gstthreadshare::runtime::{Context, PadSink, Task};
diff --git a/generic/threadshare/examples/standalone/src/imp.rs b/generic/threadshare/examples/standalone/src/imp.rs
index 821025f9c..dfddcad2d 100644
--- a/generic/threadshare/examples/standalone/src/imp.rs
+++ b/generic/threadshare/examples/standalone/src/imp.rs
@@ -13,7 +13,7 @@ use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use std::sync::Mutex;
 use std::time::Duration;
diff --git a/generic/threadshare/examples/udpsrc_benchmark_sender.rs b/generic/threadshare/examples/udpsrc_benchmark_sender.rs
index 42130ba47..2fe7504b7 100644
--- a/generic/threadshare/examples/udpsrc_benchmark_sender.rs
+++ b/generic/threadshare/examples/udpsrc_benchmark_sender.rs
@@ -20,7 +20,7 @@
 use gst::glib;
 use gst::prelude::*;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use std::net;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
diff --git a/generic/threadshare/src/appsrc/imp.rs b/generic/threadshare/src/appsrc/imp.rs
index 10e5c9637..deeffbfa6 100644
--- a/generic/threadshare/src/appsrc/imp.rs
+++ b/generic/threadshare/src/appsrc/imp.rs
@@ -26,7 +26,7 @@ use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use std::sync::Mutex;
 use std::time::Duration;
diff --git a/generic/threadshare/src/audiotestsrc/imp.rs b/generic/threadshare/src/audiotestsrc/imp.rs
index a628c1930..fddcea611 100644
--- a/generic/threadshare/src/audiotestsrc/imp.rs
+++ b/generic/threadshare/src/audiotestsrc/imp.rs
@@ -13,7 +13,7 @@ use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use std::mem::size_of;
 use std::sync::Mutex;
diff --git a/generic/threadshare/src/dataqueue.rs b/generic/threadshare/src/dataqueue.rs
index 092cb3814..17bdefe5d 100644
--- a/generic/threadshare/src/dataqueue.rs
+++ b/generic/threadshare/src/dataqueue.rs
@@ -21,7 +21,7 @@ use futures::future::{self, abortable, AbortHandle};
 
 use gst::prelude::*;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use std::collections::VecDeque;
 use std::sync::Arc;
diff --git a/generic/threadshare/src/inputselector/imp.rs b/generic/threadshare/src/inputselector/imp.rs
index 81cf5cd33..57e6ea330 100644
--- a/generic/threadshare/src/inputselector/imp.rs
+++ b/generic/threadshare/src/inputselector/imp.rs
@@ -25,7 +25,7 @@ use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
diff --git a/generic/threadshare/src/jitterbuffer/imp.rs b/generic/threadshare/src/jitterbuffer/imp.rs
index b5b515136..7bdfeaa61 100644
--- a/generic/threadshare/src/jitterbuffer/imp.rs
+++ b/generic/threadshare/src/jitterbuffer/imp.rs
@@ -26,7 +26,7 @@ use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst_rtp::RTPBuffer;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use std::cmp::Ordering;
 use std::collections::{BTreeSet, VecDeque};
diff --git a/generic/threadshare/src/proxy/imp.rs b/generic/threadshare/src/proxy/imp.rs
index 505374147..18fa42391 100644
--- a/generic/threadshare/src/proxy/imp.rs
+++ b/generic/threadshare/src/proxy/imp.rs
@@ -25,7 +25,7 @@ use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use std::collections::{HashMap, VecDeque};
 use std::sync::{Arc, Weak};
diff --git a/generic/threadshare/src/queue/imp.rs b/generic/threadshare/src/queue/imp.rs
index cc528763c..a8802f705 100644
--- a/generic/threadshare/src/queue/imp.rs
+++ b/generic/threadshare/src/queue/imp.rs
@@ -25,7 +25,7 @@ use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use std::collections::VecDeque;
 use std::sync::Mutex;
diff --git a/generic/threadshare/src/runtime/executor/context.rs b/generic/threadshare/src/runtime/executor/context.rs
index c2fbb79d3..29bca705e 100644
--- a/generic/threadshare/src/runtime/executor/context.rs
+++ b/generic/threadshare/src/runtime/executor/context.rs
@@ -5,7 +5,7 @@
 
 use futures::prelude::*;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use std::collections::HashMap;
 use std::io;
diff --git a/generic/threadshare/src/runtime/mod.rs b/generic/threadshare/src/runtime/mod.rs
index 4d77f78f2..a48c372a0 100644
--- a/generic/threadshare/src/runtime/mod.rs
+++ b/generic/threadshare/src/runtime/mod.rs
@@ -44,7 +44,7 @@ pub mod prelude {
     pub use super::task::TaskImpl;
 }
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 static RUNTIME_CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(
diff --git a/generic/threadshare/src/socket.rs b/generic/threadshare/src/socket.rs
index a815c213b..088dd5c14 100644
--- a/generic/threadshare/src/socket.rs
+++ b/generic/threadshare/src/socket.rs
@@ -23,7 +23,7 @@ use futures::future::BoxFuture;
 use gst::glib;
 use gst::prelude::*;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use gio::prelude::*;
 
diff --git a/generic/threadshare/src/tcpclientsrc/imp.rs b/generic/threadshare/src/tcpclientsrc/imp.rs
index ee6c18d63..66a556602 100644
--- a/generic/threadshare/src/tcpclientsrc/imp.rs
+++ b/generic/threadshare/src/tcpclientsrc/imp.rs
@@ -25,7 +25,7 @@ use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use std::io;
 use std::net::{IpAddr, SocketAddr, TcpStream};
diff --git a/generic/threadshare/src/udpsink/imp.rs b/generic/threadshare/src/udpsink/imp.rs
index 252030862..0f19a7618 100644
--- a/generic/threadshare/src/udpsink/imp.rs
+++ b/generic/threadshare/src/udpsink/imp.rs
@@ -26,7 +26,7 @@ use gst::subclass::prelude::*;
 use gst::EventView;
 use gst::{element_error, error_msg};
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use crate::runtime::executor::block_on_or_add_sub_task;
 use crate::runtime::prelude::*;
diff --git a/generic/threadshare/src/udpsrc/imp.rs b/generic/threadshare/src/udpsrc/imp.rs
index 18f9d0a87..997ca1f37 100644
--- a/generic/threadshare/src/udpsrc/imp.rs
+++ b/generic/threadshare/src/udpsrc/imp.rs
@@ -25,7 +25,7 @@ use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst_net::*;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use std::i32;
 use std::io;
diff --git a/generic/threadshare/tests/jitterbuffer.rs b/generic/threadshare/tests/jitterbuffer.rs
index 851d66a3b..e94226647 100644
--- a/generic/threadshare/tests/jitterbuffer.rs
+++ b/generic/threadshare/tests/jitterbuffer.rs
@@ -21,7 +21,7 @@ use gst::prelude::*;
 
 use std::sync::mpsc;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 static CAT: Lazy<gst::DebugCategory> = Lazy::new(|| {
     gst::DebugCategory::new(
diff --git a/generic/threadshare/tests/pad.rs b/generic/threadshare/tests/pad.rs
index 406b15034..c1d7c41ca 100644
--- a/generic/threadshare/tests/pad.rs
+++ b/generic/threadshare/tests/pad.rs
@@ -29,7 +29,7 @@ use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::EventView;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Mutex;
diff --git a/generic/threadshare/tests/pipeline.rs b/generic/threadshare/tests/pipeline.rs
index 5e12d6b38..b01485f77 100644
--- a/generic/threadshare/tests/pipeline.rs
+++ b/generic/threadshare/tests/pipeline.rs
@@ -20,7 +20,7 @@
 use gst::glib;
 use gst::prelude::*;
 
-use once_cell::sync::Lazy;
+use gst::glib::once_cell::sync::Lazy;
 
 use std::sync::mpsc;