language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-10-02 22:55:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: Use OnceCell in Memoized (#7500)

Browse source
This commit is contained in:
Micha Reiser 2023-09-18 21:58:55 +02:00 • committed by GitHub
parent 3336d23f48
commit 3e1dffab20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/ruff_formatter/src/format_extensions.rs
View file

@ -1,7 +1,7 @@
#![allow(dead_code)]
use crate::prelude::*;
use std::cell::RefCell;
use std::cell::OnceCell;
use std::marker::PhantomData;
use crate::Buffer;
@ -70,7 +70,7 @@ impl<T, Context> MemoizeFormat<Context> for T where T: Format<Context> {}
#[derive(Debug)]
pub struct Memoized<F, Context> {
inner: F,
memory: RefCell<Option<FormatResult<Option<FormatElement>>>>,
memory: OnceCell<FormatResult<Option<FormatElement>>>,
options: PhantomData<Context>,
}
@ -81,7 +81,7 @@ where
fn new(inner: F) -> Self {
Self {
inner,
memory: RefCell::new(None),
memory: OnceCell::new(),
options: PhantomData,
}
}
@ -142,10 +142,7 @@ where
/// # }
/// ```
pub fn inspect(&mut self, f: &mut Formatter<Context>) -> FormatResult<&[FormatElement]> {
let result = self
.memory
.get_mut()
.get_or_insert_with(|| f.intern(&self.inner));
let result = self.memory.get_or_init(|| f.intern(&self.inner));
match result.as_ref() {
Ok(Some(FormatElement::Interned(interned))) => Ok(&**interned),
@ -161,8 +158,7 @@ where
F: Format<Context>,
{
fn fmt(&self, f: &mut Formatter<Context>) -> FormatResult<()> {
let mut memory = self.memory.borrow_mut();
let result = memory.get_or_insert_with(|| f.intern(&self.inner));
let result = self.memory.get_or_init(|| f.intern(&self.inner));
match result {
Ok(Some(elements)) => {