diff --git a/Cargo.toml b/Cargo.toml index 5ffbc92..f495495 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "loupe" version = "0.1.0" edition = "2021" -rust-version = "1.65" +rust-version = "1.70" license = "GPL-3.0-or-later" [profile.release] diff --git a/src/file_model.rs b/src/file_model.rs index d9889a1..0f6a1fe 100644 --- a/src/file_model.rs +++ b/src/file_model.rs @@ -26,8 +26,8 @@ use gio::prelude::*; use gio::subclass::prelude::*; use glib::GString; use indexmap::IndexMap; -use once_cell::sync::{Lazy, OnceCell}; -use std::cell::RefCell; +use once_cell::sync::Lazy; +use std::cell::{OnceCell, RefCell}; mod imp { use super::*; diff --git a/src/widgets/image.rs b/src/widgets/image.rs index a415146..58c4328 100644 --- a/src/widgets/image.rs +++ b/src/widgets/image.rs @@ -41,9 +41,8 @@ use adw::{prelude::*, subclass::prelude::*}; use arc_swap::ArcSwap; use futures::prelude::*; use once_cell::sync::Lazy; -use once_cell::unsync::OnceCell; -use std::cell::{Cell, RefCell}; +use std::cell::{Cell, OnceCell, RefCell}; use std::sync::Arc; /// Default background color around images and behind transparent images diff --git a/src/widgets/image_view.rs b/src/widgets/image_view.rs index 22e37d4..bcecd13 100644 --- a/src/widgets/image_view.rs +++ b/src/widgets/image_view.rs @@ -54,7 +54,7 @@ use std::cell::{Cell, RefCell}; const BUFFER: usize = 2; mod imp { - use once_cell::sync::OnceCell; + use std::cell::OnceCell; use super::*; diff --git a/src/widgets/sliding_view.rs b/src/widgets/sliding_view.rs index f9795a8..0ac7c86 100644 --- a/src/widgets/sliding_view.rs +++ b/src/widgets/sliding_view.rs @@ -27,9 +27,9 @@ use crate::widgets::LpImagePage; use adw::prelude::*; use adw::subclass::prelude::*; use indexmap::IndexMap; -use once_cell::sync::{Lazy, OnceCell}; +use once_cell::sync::Lazy; -use std::cell::{Cell, RefCell}; +use std::cell::{Cell, OnceCell, RefCell}; static SCROLL_DAMPING_RATIO: f64 = 1.; static SCROLL_MASS: f64 = 0.5; diff --git a/src/window.rs b/src/window.rs index 3fbc606..d27f184 100644 --- a/src/window.rs +++ b/src/window.rs @@ -30,9 +30,7 @@ use adw::subclass::prelude::*; use glib::clone; use gtk::CompositeTemplate; -use once_cell::sync::OnceCell; - -use std::cell::{Cell, RefCell}; +use std::cell::{Cell, OnceCell, RefCell}; use std::path::{Path, PathBuf}; use crate::config;