Use re-exported once_cell

gtk-rs · Jul 6, 2023 · 788153b · 788153b
1 parent 1af865b
commit 788153b
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 19 deletions.
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -6,7 +6,6 @@ edition = "2021"
 
 [dependencies]
 chrono = "0.4"
-once_cell = "1.0"
 
 femtovg = { version = "0.7", optional = true, default-features = false }
 glium = { version = "0.32", optional = true, default-features = false }

diff --git a/examples/custom_editable/custom_tag/imp.rs b/examples/custom_editable/custom_tag/imp.rs
@@ -1,10 +1,10 @@
 use glib::clone;
+use glib::once_cell::sync::Lazy;
 use glib::subclass::Signal;
 use glib::{ParamSpec, Properties};
 use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
-use once_cell::sync::Lazy;
 use std::cell::{Cell, RefCell};
 
 #[derive(Debug, Properties)]

diff --git a/examples/expressions/note/imp.rs b/examples/expressions/note/imp.rs
@@ -2,7 +2,7 @@ use glib::prelude::*;
 use glib::subclass::prelude::*;
 use gtk::glib::{self, Properties};
 
-use once_cell::unsync::OnceCell;
+use glib::once_cell::unsync::OnceCell;
 
 use super::Metadata;
 

diff --git a/gtk4/Cargo.toml b/gtk4/Cargo.toml
@@ -51,7 +51,6 @@ graphene = {package = "graphene-rs", git = "https://github.com/gtk-rs/gtk-rs-cor
 gsk = {package = "gsk4", path = "../gsk4", version = "0.7"}
 gtk4-macros = {path = "../gtk4-macros", version = "0.7"}
 libc = "0.2"
-once_cell = "1.0"
 pango = {git = "https://github.com/gtk-rs/gtk-rs-core", version = "0.18", features = ["v1_46"]}
 
 [dev-dependencies]

diff --git a/gtk4/src/builder_rust_scope.rs b/gtk4/src/builder_rust_scope.rs
@@ -301,8 +301,8 @@ mod tests {
 
     #[crate::test]
     fn test_rust_builder_scope_object_during_dispose() {
+        use glib::once_cell::sync::Lazy;
         use glib::subclass::Signal;
-        use once_cell::sync::Lazy;
         use std::{cell::Cell, rc::Rc};
 
         #[derive(Debug, Default)]

diff --git a/gtk4/src/functions.rs b/gtk4/src/functions.rs
@@ -1,8 +1,7 @@
 // Take a look at the license at the top of the repository in the LICENSE file.
 
 use crate::{prelude::*, AboutDialog, StyleProvider, Window};
-use glib::{translate::*, IntoGStr, Quark, Slice, ToValue};
-use once_cell::sync::Lazy;
+use glib::{once_cell::sync::Lazy, translate::*, IntoGStr, Quark, Slice, ToValue};
 use std::{boxed::Box as Box_, mem, pin::Pin, ptr};
 
 #[doc(alias = "gtk_accelerator_valid")]

diff --git a/gtk4/src/lib.rs b/gtk4/src/lib.rs
@@ -78,8 +78,8 @@ where
         .unwrap_or_else(|e| std::panic::resume_unwind(e))
 }
 
-static TEST_THREAD_WORKER: once_cell::sync::Lazy<glib::ThreadPool> =
-    once_cell::sync::Lazy::new(|| {
+static TEST_THREAD_WORKER: glib::once_cell::sync::Lazy<glib::ThreadPool> =
+    glib::once_cell::sync::Lazy::new(|| {
         let pool = glib::ThreadPool::exclusive(1).unwrap();
         pool.push(move || {
             crate::init().expect("Tests failed to initialize gtk");

diff --git a/gtk4/src/subclass/buildable.rs b/gtk4/src/subclass/buildable.rs
@@ -5,8 +5,7 @@
 
 use crate::{prelude::*, subclass::prelude::*, Buildable, Builder};
 use glib::translate::*;
-use glib::{GString, Object, Quark, Value};
-use once_cell::sync::Lazy;
+use glib::{once_cell::sync::Lazy, GString, Object, Quark, Value};
 
 use super::PtrHolder;
 

diff --git a/gtk4/src/subclass/cell_layout.rs b/gtk4/src/subclass/cell_layout.rs
@@ -6,8 +6,7 @@
 use crate::{
     prelude::*, subclass::prelude::*, CellArea, CellLayout, CellRenderer, TreeIter, TreeModel,
 };
-use glib::{translate::*, Quark};
-use once_cell::sync::Lazy;
+use glib::{once_cell::sync::Lazy, translate::*, Quark};
 
 #[derive(Debug)]
 pub struct CellLayoutDataCallback {

diff --git a/gtk4/src/subclass/editable.rs b/gtk4/src/subclass/editable.rs
@@ -4,9 +4,8 @@
 //! Traits intended for implementing the [`Editable`](crate::Editable) interface.
 
 use crate::{prelude::*, subclass::prelude::*, Editable};
-use glib::{translate::*, GString, Quark};
+use glib::{once_cell::sync::Lazy, translate::*, GString, Quark};
 use libc::{c_char, c_int};
-use once_cell::sync::Lazy;
 
 pub trait EditableImpl: WidgetImpl {
     fn insert_text(&self, text: &str, length: i32, position: &mut i32) {

diff --git a/gtk4/src/subclass/entry_buffer.rs b/gtk4/src/subclass/entry_buffer.rs
@@ -4,8 +4,7 @@
 //! Traits intended for subclassing [`EntryBuffer`](crate::EntryBuffer).
 
 use crate::{prelude::*, subclass::prelude::*, EntryBuffer};
-use glib::{translate::*, GString};
-use once_cell::sync::Lazy;
+use glib::{once_cell::sync::Lazy, translate::*, GString};
 
 use super::PtrHolder;
 

diff --git a/gtk4/src/subclass/font_chooser.rs b/gtk4/src/subclass/font_chooser.rs
@@ -4,8 +4,7 @@
 //! Traits intended for implementing the [`FontChooser`](crate::FontChooser) interface.
 
 use crate::{prelude::*, subclass::prelude::*, FontChooser};
-use glib::{translate::*, GString, Quark};
-use once_cell::sync::Lazy;
+use glib::{once_cell::sync::Lazy, translate::*, GString, Quark};
 use pango::{FontFace, FontFamily, FontMap};
 
 use super::PtrHolder;