Skip to content

Commit caa3478

Browse files
authored
Rollup merge of rust-lang#72414 - KodrAus:feat/stdlazy, r=Mark-Simulacrum
Add lazy initialization primitives to std Follow-up to rust-lang#68198 Current RFC: rust-lang/rfcs#2788 Rebased and fixed up a few of the dangling comments. Some notes carried over from the previous PR: - [ ] Naming. I'm ok to just roll with the `Sync` prefix like `SyncLazy` for now, but [have a personal preference for `Atomic`](rust-lang/rfcs#2788 (comment)) like `AtomicLazy`. - [x] [Poisoning](rust-lang/rfcs#2788 (comment)). It seems like there's [some regret around poisoning in other `std::sync` types that we might want to just avoid upfront for `std::lazy`, especially if that would align with a future `std::mutex` that doesn't poison](https://rust-lang.zulipchat.com/#narrow/stream/219381-t-libs/topic/parking_lot.3A.3AMutex.20in.20std/near/190331199). Personally, if we're adding these types to `std::lazy` instead of `std::sync`, I'd be on-board with not worrying about poisoning in `std::lazy`, and potentially deprecating `std::sync::Once` and `lazy_static` in favour of `std::lazy` down the track if it's possible, rather than attempting to replicate their behavior. cc @Amanieu @sfackler. - [ ] [Consider making`SyncOnceCell::get` blocking](matklad/once_cell#92). There doesn't seem to be consensus in the linked PR on whether or not that's strictly better than the non-blocking variant. In general, none of these seem to be really blocking an initial unstable merge, so we could possibly kick off a FCP if y'all are happy? cc @matklad @pitdicker have I missed anything, or were there any other considerations that have come up since we last looked at this?
2 parents d3df851 + fe63905 commit caa3478

File tree

7 files changed

+1373
-4
lines changed

7 files changed

+1373
-4
lines changed

src/libcore/lazy.rs

+379
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,379 @@
1+
//! Lazy values and one-time initialization of static data.
2+
3+
use crate::cell::{Cell, UnsafeCell};
4+
use crate::fmt;
5+
use crate::mem;
6+
use crate::ops::Deref;
7+
8+
/// A cell which can be written to only once.
9+
///
10+
/// Unlike `RefCell`, a `OnceCell` only provides shared `&T` references to its value.
11+
/// Unlike `Cell`, a `OnceCell` doesn't require copying or replacing the value to access it.
12+
///
13+
/// # Examples
14+
///
15+
/// ```
16+
/// #![feature(once_cell)]
17+
///
18+
/// use std::lazy::OnceCell;
19+
///
20+
/// let cell = OnceCell::new();
21+
/// assert!(cell.get().is_none());
22+
///
23+
/// let value: &String = cell.get_or_init(|| {
24+
/// "Hello, World!".to_string()
25+
/// });
26+
/// assert_eq!(value, "Hello, World!");
27+
/// assert!(cell.get().is_some());
28+
/// ```
29+
#[unstable(feature = "once_cell", issue = "74465")]
30+
pub struct OnceCell<T> {
31+
// Invariant: written to at most once.
32+
inner: UnsafeCell<Option<T>>,
33+
}
34+
35+
#[unstable(feature = "once_cell", issue = "74465")]
36+
impl<T> Default for OnceCell<T> {
37+
fn default() -> Self {
38+
Self::new()
39+
}
40+
}
41+
42+
#[unstable(feature = "once_cell", issue = "74465")]
43+
impl<T: fmt::Debug> fmt::Debug for OnceCell<T> {
44+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
45+
match self.get() {
46+
Some(v) => f.debug_tuple("OnceCell").field(v).finish(),
47+
None => f.write_str("OnceCell(Uninit)"),
48+
}
49+
}
50+
}
51+
52+
#[unstable(feature = "once_cell", issue = "74465")]
53+
impl<T: Clone> Clone for OnceCell<T> {
54+
fn clone(&self) -> OnceCell<T> {
55+
let res = OnceCell::new();
56+
if let Some(value) = self.get() {
57+
match res.set(value.clone()) {
58+
Ok(()) => (),
59+
Err(_) => unreachable!(),
60+
}
61+
}
62+
res
63+
}
64+
}
65+
66+
#[unstable(feature = "once_cell", issue = "74465")]
67+
impl<T: PartialEq> PartialEq for OnceCell<T> {
68+
fn eq(&self, other: &Self) -> bool {
69+
self.get() == other.get()
70+
}
71+
}
72+
73+
#[unstable(feature = "once_cell", issue = "74465")]
74+
impl<T: Eq> Eq for OnceCell<T> {}
75+
76+
#[unstable(feature = "once_cell", issue = "74465")]
77+
impl<T> From<T> for OnceCell<T> {
78+
fn from(value: T) -> Self {
79+
OnceCell { inner: UnsafeCell::new(Some(value)) }
80+
}
81+
}
82+
83+
impl<T> OnceCell<T> {
84+
/// Creates a new empty cell.
85+
#[unstable(feature = "once_cell", issue = "74465")]
86+
pub const fn new() -> OnceCell<T> {
87+
OnceCell { inner: UnsafeCell::new(None) }
88+
}
89+
90+
/// Gets the reference to the underlying value.
91+
///
92+
/// Returns `None` if the cell is empty.
93+
#[unstable(feature = "once_cell", issue = "74465")]
94+
pub fn get(&self) -> Option<&T> {
95+
// Safety: Safe due to `inner`'s invariant
96+
unsafe { &*self.inner.get() }.as_ref()
97+
}
98+
99+
/// Gets the mutable reference to the underlying value.
100+
///
101+
/// Returns `None` if the cell is empty.
102+
#[unstable(feature = "once_cell", issue = "74465")]
103+
pub fn get_mut(&mut self) -> Option<&mut T> {
104+
// Safety: Safe because we have unique access
105+
unsafe { &mut *self.inner.get() }.as_mut()
106+
}
107+
108+
/// Sets the contents of the cell to `value`.
109+
///
110+
/// # Errors
111+
///
112+
/// This method returns `Ok(())` if the cell was empty and `Err(value)` if
113+
/// it was full.
114+
///
115+
/// # Examples
116+
///
117+
/// ```
118+
/// #![feature(once_cell)]
119+
///
120+
/// use std::lazy::OnceCell;
121+
///
122+
/// let cell = OnceCell::new();
123+
/// assert!(cell.get().is_none());
124+
///
125+
/// assert_eq!(cell.set(92), Ok(()));
126+
/// assert_eq!(cell.set(62), Err(62));
127+
///
128+
/// assert!(cell.get().is_some());
129+
/// ```
130+
#[unstable(feature = "once_cell", issue = "74465")]
131+
pub fn set(&self, value: T) -> Result<(), T> {
132+
// Safety: Safe because we cannot have overlapping mutable borrows
133+
let slot = unsafe { &*self.inner.get() };
134+
if slot.is_some() {
135+
return Err(value);
136+
}
137+
138+
// Safety: This is the only place where we set the slot, no races
139+
// due to reentrancy/concurrency are possible, and we've
140+
// checked that slot is currently `None`, so this write
141+
// maintains the `inner`'s invariant.
142+
let slot = unsafe { &mut *self.inner.get() };
143+
*slot = Some(value);
144+
Ok(())
145+
}
146+
147+
/// Gets the contents of the cell, initializing it with `f`
148+
/// if the cell was empty.
149+
///
150+
/// # Panics
151+
///
152+
/// If `f` panics, the panic is propagated to the caller, and the cell
153+
/// remains uninitialized.
154+
///
155+
/// It is an error to reentrantly initialize the cell from `f`. Doing
156+
/// so results in a panic.
157+
///
158+
/// # Examples
159+
///
160+
/// ```
161+
/// #![feature(once_cell)]
162+
///
163+
/// use std::lazy::OnceCell;
164+
///
165+
/// let cell = OnceCell::new();
166+
/// let value = cell.get_or_init(|| 92);
167+
/// assert_eq!(value, &92);
168+
/// let value = cell.get_or_init(|| unreachable!());
169+
/// assert_eq!(value, &92);
170+
/// ```
171+
#[unstable(feature = "once_cell", issue = "74465")]
172+
pub fn get_or_init<F>(&self, f: F) -> &T
173+
where
174+
F: FnOnce() -> T,
175+
{
176+
match self.get_or_try_init(|| Ok::<T, !>(f())) {
177+
Ok(val) => val,
178+
}
179+
}
180+
181+
/// Gets the contents of the cell, initializing it with `f` if
182+
/// the cell was empty. If the cell was empty and `f` failed, an
183+
/// error is returned.
184+
///
185+
/// # Panics
186+
///
187+
/// If `f` panics, the panic is propagated to the caller, and the cell
188+
/// remains uninitialized.
189+
///
190+
/// It is an error to reentrantly initialize the cell from `f`. Doing
191+
/// so results in a panic.
192+
///
193+
/// # Examples
194+
///
195+
/// ```
196+
/// #![feature(once_cell)]
197+
///
198+
/// use std::lazy::OnceCell;
199+
///
200+
/// let cell = OnceCell::new();
201+
/// assert_eq!(cell.get_or_try_init(|| Err(())), Err(()));
202+
/// assert!(cell.get().is_none());
203+
/// let value = cell.get_or_try_init(|| -> Result<i32, ()> {
204+
/// Ok(92)
205+
/// });
206+
/// assert_eq!(value, Ok(&92));
207+
/// assert_eq!(cell.get(), Some(&92))
208+
/// ```
209+
#[unstable(feature = "once_cell", issue = "74465")]
210+
pub fn get_or_try_init<F, E>(&self, f: F) -> Result<&T, E>
211+
where
212+
F: FnOnce() -> Result<T, E>,
213+
{
214+
if let Some(val) = self.get() {
215+
return Ok(val);
216+
}
217+
let val = f()?;
218+
// Note that *some* forms of reentrant initialization might lead to
219+
// UB (see `reentrant_init` test). I believe that just removing this
220+
// `assert`, while keeping `set/get` would be sound, but it seems
221+
// better to panic, rather than to silently use an old value.
222+
assert!(self.set(val).is_ok(), "reentrant init");
223+
Ok(self.get().unwrap())
224+
}
225+
226+
/// Consumes the cell, returning the wrapped value.
227+
///
228+
/// Returns `None` if the cell was empty.
229+
///
230+
/// # Examples
231+
///
232+
/// ```
233+
/// #![feature(once_cell)]
234+
///
235+
/// use std::lazy::OnceCell;
236+
///
237+
/// let cell: OnceCell<String> = OnceCell::new();
238+
/// assert_eq!(cell.into_inner(), None);
239+
///
240+
/// let cell = OnceCell::new();
241+
/// cell.set("hello".to_string()).unwrap();
242+
/// assert_eq!(cell.into_inner(), Some("hello".to_string()));
243+
/// ```
244+
#[unstable(feature = "once_cell", issue = "74465")]
245+
pub fn into_inner(self) -> Option<T> {
246+
// Because `into_inner` takes `self` by value, the compiler statically verifies
247+
// that it is not currently borrowed. So it is safe to move out `Option<T>`.
248+
self.inner.into_inner()
249+
}
250+
251+
/// Takes the value out of this `OnceCell`, moving it back to an uninitialized state.
252+
///
253+
/// Has no effect and returns `None` if the `OnceCell` hasn't been initialized.
254+
///
255+
/// Safety is guaranteed by requiring a mutable reference.
256+
///
257+
/// # Examples
258+
///
259+
/// ```
260+
/// #![feature(once_cell)]
261+
///
262+
/// use std::lazy::OnceCell;
263+
///
264+
/// let mut cell: OnceCell<String> = OnceCell::new();
265+
/// assert_eq!(cell.take(), None);
266+
///
267+
/// let mut cell = OnceCell::new();
268+
/// cell.set("hello".to_string()).unwrap();
269+
/// assert_eq!(cell.take(), Some("hello".to_string()));
270+
/// assert_eq!(cell.get(), None);
271+
/// ```
272+
#[unstable(feature = "once_cell", issue = "74465")]
273+
pub fn take(&mut self) -> Option<T> {
274+
mem::take(self).into_inner()
275+
}
276+
}
277+
278+
/// A value which is initialized on the first access.
279+
///
280+
/// # Examples
281+
///
282+
/// ```
283+
/// #![feature(once_cell)]
284+
///
285+
/// use std::lazy::Lazy;
286+
///
287+
/// let lazy: Lazy<i32> = Lazy::new(|| {
288+
/// println!("initializing");
289+
/// 92
290+
/// });
291+
/// println!("ready");
292+
/// println!("{}", *lazy);
293+
/// println!("{}", *lazy);
294+
///
295+
/// // Prints:
296+
/// // ready
297+
/// // initializing
298+
/// // 92
299+
/// // 92
300+
/// ```
301+
#[unstable(feature = "once_cell", issue = "74465")]
302+
pub struct Lazy<T, F = fn() -> T> {
303+
cell: OnceCell<T>,
304+
init: Cell<Option<F>>,
305+
}
306+
307+
#[unstable(feature = "once_cell", issue = "74465")]
308+
impl<T: fmt::Debug, F> fmt::Debug for Lazy<T, F> {
309+
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
310+
f.debug_struct("Lazy").field("cell", &self.cell).field("init", &"..").finish()
311+
}
312+
}
313+
314+
impl<T, F> Lazy<T, F> {
315+
/// Creates a new lazy value with the given initializing function.
316+
///
317+
/// # Examples
318+
///
319+
/// ```
320+
/// #![feature(once_cell)]
321+
///
322+
/// # fn main() {
323+
/// use std::lazy::Lazy;
324+
///
325+
/// let hello = "Hello, World!".to_string();
326+
///
327+
/// let lazy = Lazy::new(|| hello.to_uppercase());
328+
///
329+
/// assert_eq!(&*lazy, "HELLO, WORLD!");
330+
/// # }
331+
/// ```
332+
#[unstable(feature = "once_cell", issue = "74465")]
333+
pub const fn new(init: F) -> Lazy<T, F> {
334+
Lazy { cell: OnceCell::new(), init: Cell::new(Some(init)) }
335+
}
336+
}
337+
338+
impl<T, F: FnOnce() -> T> Lazy<T, F> {
339+
/// Forces the evaluation of this lazy value and returns a reference to
340+
/// the result.
341+
///
342+
/// This is equivalent to the `Deref` impl, but is explicit.
343+
///
344+
/// # Examples
345+
///
346+
/// ```
347+
/// #![feature(once_cell)]
348+
///
349+
/// use std::lazy::Lazy;
350+
///
351+
/// let lazy = Lazy::new(|| 92);
352+
///
353+
/// assert_eq!(Lazy::force(&lazy), &92);
354+
/// assert_eq!(&*lazy, &92);
355+
/// ```
356+
#[unstable(feature = "once_cell", issue = "74465")]
357+
pub fn force(this: &Lazy<T, F>) -> &T {
358+
this.cell.get_or_init(|| match this.init.take() {
359+
Some(f) => f(),
360+
None => panic!("`Lazy` instance has previously been poisoned"),
361+
})
362+
}
363+
}
364+
365+
#[unstable(feature = "once_cell", issue = "74465")]
366+
impl<T, F: FnOnce() -> T> Deref for Lazy<T, F> {
367+
type Target = T;
368+
fn deref(&self) -> &T {
369+
Lazy::force(self)
370+
}
371+
}
372+
373+
#[unstable(feature = "once_cell", issue = "74465")]
374+
impl<T: Default> Default for Lazy<T> {
375+
/// Creates a new lazy value using `Default` as the initializing function.
376+
fn default() -> Lazy<T> {
377+
Lazy::new(T::default)
378+
}
379+
}

src/libcore/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,8 @@ pub mod char;
239239
pub mod ffi;
240240
#[cfg(not(test))] // See #65860
241241
pub mod iter;
242+
#[unstable(feature = "once_cell", issue = "74465")]
243+
pub mod lazy;
242244
pub mod option;
243245
pub mod panic;
244246
pub mod panicking;

0 commit comments

Comments
 (0)