Move OnceCell to lib.

src/config/hashing.rs

@@ -19,12 +19,7 @@
 //! ```
 
 use super::hashing_env;
-
-#[cfg(feature = "std")]
-pub use once_cell::sync::OnceCell;
-
-#[cfg(not(feature = "std"))]
-pub use once_cell::race::OnceBox as OnceCell;
+use crate::OnceCell;
 
 static HASHING_SEED: OnceCell<Option<[u64; 4]>> = OnceCell::new();
 

src/eval/chaining.rs

@@ -3,12 +3,12 @@
 
 use super::{Caches, GlobalRuntimeState, Target};
 use crate::ast::{ASTFlags, BinaryExpr, Expr, OpAssignment};
-use crate::config::hashing::OnceCell;
 use crate::engine::{FN_IDX_GET, FN_IDX_SET};
 use crate::eval::search_namespace;
 use crate::types::dynamic::Union;
 use crate::{
-    calc_fn_hash, Dynamic, Engine, FnArgsVec, Position, RhaiResult, RhaiResultOf, Scope, ERR,
+    calc_fn_hash, Dynamic, Engine, FnArgsVec, OnceCell, Position, RhaiResult, RhaiResultOf, Scope,
+    ERR,
 };
 use std::hash::Hash;
 #[cfg(feature = "no_std")]

src/lib.rs

@@ -220,6 +220,12 @@ type ExclusiveRange = std::ops::Range<INT>;
 /// An inclusive integer range.
 type InclusiveRange = std::ops::RangeInclusive<INT>;
 
+#[cfg(feature = "std")]
+use once_cell::sync::OnceCell;
+
+#[cfg(not(feature = "std"))]
+use once_cell::race::OnceBox as OnceCell;
+
 #[allow(deprecated)]
 pub use api::build_type::{CustomType, TypeBuilder};
 #[cfg(not(feature = "no_custom_syntax"))]