From 5e9f0db4bdb6fe55080b685a163e7e86066ae2d4 Mon Sep 17 00:00:00 2001 From: Joe Bellus Date: Wed, 19 Oct 2022 21:41:47 -0400 Subject: [PATCH] Linting fixes --- abacus-core/src/dataframe.rs | 12 ++++++------ abacus-core/src/engine.rs | 2 -- abacus-ui/src/data/app_data.rs | 20 -------------------- 3 files changed, 6 insertions(+), 28 deletions(-) diff --git a/abacus-core/src/dataframe.rs b/abacus-core/src/dataframe.rs index 7e402ba..12b4ef5 100644 --- a/abacus-core/src/dataframe.rs +++ b/abacus-core/src/dataframe.rs @@ -743,23 +743,23 @@ from data ["age"] : ["age" gt 18]; pub fn test_series_min() { let res = process(r#"series((2..4).collect()).min()"#); dbg!(&res); - let s = res.into_scalar().as_float().unwrap(); - assert_eq!(s, 2.0); + let s = res.into_scalar(); + assert_eq!(s, "2.0"); } #[test] pub fn test_series_max() { let res = process(r#"series((2..4).collect()).max()"#); dbg!(&res); - let s = res.into_scalar().as_float().unwrap(); - assert_eq!(s, 3.0); + let s = res.into_scalar(); + assert_eq!(s, "3.0"); } #[test] pub fn test_series_mean() { let res = process(r#"series((1..51).collect()).mean()"#); dbg!(&res); - let s = res.into_scalar().as_float().unwrap(); - assert_eq!(s, 25.5); + let s = res.into_scalar(); + assert_eq!(s, "25.5"); } } diff --git a/abacus-core/src/engine.rs b/abacus-core/src/engine.rs index 3e89a38..f864b9b 100644 --- a/abacus-core/src/engine.rs +++ b/abacus-core/src/engine.rs @@ -1,5 +1,3 @@ -use std::sync::Arc; - use crate::dataframe; #[derive(Debug)] diff --git a/abacus-ui/src/data/app_data.rs b/abacus-ui/src/data/app_data.rs index d2d0b5a..097b65d 100644 --- a/abacus-ui/src/data/app_data.rs +++ b/abacus-ui/src/data/app_data.rs @@ -46,26 +46,6 @@ impl Default for AppData { } } -impl AppData { - pub fn process(&mut self) { - let mut engine = abacus_core::Engine::default(); - - for mut block in self.blocks.iter_mut() { - let start = std::time::Instant::now(); - block.output = engine.process_script(&block.editor_data.content.to_string()); - println!("block executed in {}", start.elapsed().as_millis()); - } - } - pub fn process_block(&mut self, index: usize) { - let mut engine = abacus_core::Engine::default(); - if let Some(block) = self.blocks.get_mut(index) { - let start = std::time::Instant::now(); - block.output = engine.process_script(&block.editor_data.content.to_string()); - println!("block executed in {}", start.elapsed().as_millis()); - } - } -} - #[derive(Clone, Data, Lens, Default, PartialEq, Debug)] pub struct Block { pub name: String,