diff --git a/src/function.rs b/src/function.rs index 2691c19..c9d474c 100644 --- a/src/function.rs +++ b/src/function.rs @@ -5,15 +5,17 @@ use crate::misc::*; use crate::parsing::{process_func_str, BackingFunction}; use crate::suggestions::{generate_hint, HintEnum}; use eframe::{egui, epaint}; -use egui::{ - epaint::text::cursor::Cursor, text::CCursor, text_edit::CursorRange, Key, TextEdit, Widget, -}; use egui::{ plot::{BarChart, PlotUi, Value}, + text::CCursor, + text_edit::CursorRange, widgets::plot::Bar, + Key, TextEdit, Widget, +}; +use epaint::{ + text::cursor::{Cursor, PCursor, RCursor}, + Color32, }; -use epaint::text::cursor::{PCursor, RCursor}; -use epaint::Color32; use std::fmt::{self, Debug}; #[cfg(threading)] diff --git a/src/math_app.rs b/src/math_app.rs index 5d5001a..1bca6c0 100644 --- a/src/math_app.rs +++ b/src/math_app.rs @@ -2,12 +2,10 @@ use crate::consts::*; use crate::function::{FunctionEntry, Riemann, DEFAULT_FUNCTION_ENTRY}; use crate::misc::{dyn_mut_iter, option_vec_printer, JsonFileOutput, SerdeValueHelper}; use eframe::{egui, epi}; -use egui::plot::Plot; use egui::{ - Button, CentralPanel, Color32, ComboBox, Context, FontData, FontDefinitions, FontFamily, Key, - RichText, SidePanel, Slider, TopBottomPanel, Vec2, Visuals, Window, + plot::Plot, Button, CentralPanel, Color32, ComboBox, Context, FontData, FontDefinitions, + FontFamily, Key, RichText, SidePanel, Slider, TopBottomPanel, Vec2, Visuals, Window, }; -use epi::Frame; use instant::Duration; use std::{collections::BTreeMap, io::Read, ops::BitXorAssign, str}; @@ -543,7 +541,7 @@ impl MathApp { impl epi::App for MathApp { /// Called each time the UI needs repainting, which may be many times per /// second. - fn update(&mut self, ctx: &Context, _frame: &mut Frame) { + fn update(&mut self, ctx: &Context, _frame: &mut epi::Frame) { // start timer let start = instant::Instant::now();