danvics/oxipng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bring back RefCell

Browse source 
It was accidentally removed as part of #208.
Fixes #214.
This commit is contained in:
Ingvar Stepanyan 2020-04-16 23:20:57 +01:00 committed by Josh Holmer
parent 9b8361171f
commit 4fd9203800
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/evaluate.rs
View file

@ -12,14 +12,15 @@ use crate::png::STD_WINDOW;
#[cfg(not(feature = "parallel"))] #[cfg(not(feature = "parallel"))]
use crate::rayon; use crate::rayon;
use crate::Deadline; use crate::Deadline;
#[cfg(feature = "parallel")]
use rayon;
use rayon::prelude::*; use rayon::prelude::*;
#[cfg(not(feature = "parallel"))]
use std::cell::RefCell;
use std::sync::atomic::AtomicUsize; use std::sync::atomic::AtomicUsize;
use std::sync::atomic::Ordering::SeqCst; use std::sync::atomic::Ordering::SeqCst;
#[cfg(feature = "parallel")] #[cfg(feature = "parallel")]
use std::sync::mpsc::*; use std::sync::mpsc::*;
use std::sync::Arc; use std::sync::Arc;
#[cfg(feature = "parallel")]
use std::thread; use std::thread;
struct Candidate { struct Candidate {
@ -54,7 +55,7 @@ pub(crate) struct Evaluator {
eval_thread: thread::JoinHandle<Option<Candidate>>, eval_thread: thread::JoinHandle<Option<Candidate>>,
// in non-parallel mode, images are evaluated synchronously // in non-parallel mode, images are evaluated synchronously
#[cfg(not(feature = "parallel"))] #[cfg(not(feature = "parallel"))]
eval_best_candidate: Option<Candidate>, eval_best_candidate: RefCell<Option<Candidate>>,
} }
impl Evaluator { impl Evaluator {
@ -70,7 +71,7 @@ impl Evaluator {
#[cfg(feature = "parallel")] #[cfg(feature = "parallel")]
eval_thread: thread::spawn(move || rx.into_iter().min_by_key(Candidate::cmp_key)), eval_thread: thread::spawn(move || rx.into_iter().min_by_key(Candidate::cmp_key)),
#[cfg(not(feature = "parallel"))] #[cfg(not(feature = "parallel"))]
eval_best_candidate: None, eval_best_candidate: RefCell::new(None),
} }
} }
@ -84,7 +85,7 @@ impl Evaluator {
#[cfg(not(feature = "parallel"))] #[cfg(not(feature = "parallel"))]
fn get_best_candidate(self) -> Option<Candidate> { fn get_best_candidate(self) -> Option<Candidate> {
self.eval_best_candidate self.eval_best_candidate.into_inner()
} }
pub fn get_result(self) -> Option<PngData> { pub fn get_result(self) -> Option<PngData> {
@ -151,9 +152,9 @@ impl Evaluator {
#[cfg(not(feature = "parallel"))] #[cfg(not(feature = "parallel"))]
{ {
match self.eval_best_candidate { match &mut *self.eval_best_candidate.borrow_mut() {
Some(prev) if prev.cmp_key() < new.cmp_key() => {} Some(prev) if prev.cmp_key() < new.cmp_key() => {}
_ => self.eval_best_candidate = Some(new), best => *best = Some(new),
} }
} }
} }