formatting

This commit is contained in:
Simon Gardling 2022-03-09 10:52:06 -05:00
parent bc026b0b7d
commit 91877156e5
2 changed files with 11 additions and 9 deletions

View File

@ -1,5 +1,5 @@
use crate::function::{FunctionEntry, RiemannSum, EMPTY_FUNCTIONENTRY}; use crate::function::{FunctionEntry, RiemannSum, EMPTY_FUNCTION_ENTRY};
use crate::misc::{digits_precision, log_helper, debug_log}; use crate::misc::{debug_log, digits_precision, log_helper};
use crate::parsing::{add_asterisks, test_func}; use crate::parsing::{add_asterisks, test_func};
use const_format::formatc; use const_format::formatc;
@ -12,10 +12,12 @@ use egui::{
use epi::{Frame, Storage}; use epi::{Frame, Storage};
use instant::Duration; use instant::Duration;
use shadow_rs::shadow; use shadow_rs::shadow;
use std::collections::BTreeMap; use std::{
use std::io::Read; collections::BTreeMap,
use std::ops::{BitXorAssign, RangeInclusive}; io::Read,
use std::str; ops::{BitXorAssign, RangeInclusive},
str,
};
shadow!(build); shadow!(build);
@ -260,7 +262,7 @@ pub struct MathApp {
impl Default for MathApp { impl Default for MathApp {
fn default() -> Self { fn default() -> Self {
Self { Self {
functions: vec![EMPTY_FUNCTIONENTRY.clone().integral(true)], functions: vec![EMPTY_FUNCTION_ENTRY.clone().integral(true)],
func_strs: vec![String::from(DEFAULT_FUNCION)], func_strs: vec![String::from(DEFAULT_FUNCION)],
last_error: Vec::new(), last_error: Vec::new(),
last_info: (vec![0.0], Duration::ZERO), last_info: (vec![0.0], Duration::ZERO),
@ -459,7 +461,7 @@ impl epi::App for MathApp {
.clicked() .clicked()
{ {
self.functions.push( self.functions.push(
EMPTY_FUNCTIONENTRY EMPTY_FUNCTION_ENTRY
.clone() .clone()
.update_riemann(self.settings.sum), .update_riemann(self.settings.sum),
); );

View File

@ -24,7 +24,7 @@ impl fmt::Display for RiemannSum {
} }
lazy_static::lazy_static! { lazy_static::lazy_static! {
pub static ref EMPTY_FUNCTIONENTRY: FunctionEntry = FunctionEntry::empty(); pub static ref EMPTY_FUNCTION_ENTRY: FunctionEntry = FunctionEntry::empty();
} }
#[derive(Clone)] #[derive(Clone)]