titaniumtown/YTBN-Graphing-Software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove some unwrap_unchecked

Browse Source
This commit is contained in:
Simon Gardling 2025-12-05 20:36:28 -05:00
parent 5480522ddb
commit b08a727fe3
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/math_app.rs
View File

@ -489,13 +489,8 @@ impl App for MathApp {
.iter() .iter()
.map(|(_, func)| func.get_test_result()) .map(|(_, func)| func.get_test_result())
.enumerate() .enumerate()
.filter(|(_, error)| error.is_some()) .filter_map(|(i, error)| error.as_ref().map(|x| (i, x)))
.map(|(i, error)| { .map(|(i, error)| format!("(Function #{}) {}\n", i, error))
// use unwrap_unchecked as None Errors are already filtered out
unsafe {
format!("(Function #{}) {}\n", i, error.as_ref().unwrap_unchecked())
}
})
.join(""); .join("");
if !errors_formatted.is_empty() { if !errors_formatted.is_empty() {

6
src/misc.rs
View File

@ -1,5 +1,5 @@
use base64::Engine;
use base64::engine::general_purpose; use base64::engine::general_purpose;
use base64::Engine;
use egui_plot::{Line, PlotPoint, PlotPoints, Points}; use egui_plot::{Line, PlotPoint, PlotPoints, Points};
use emath::Pos2; use emath::Pos2;
use itertools::Itertools; use itertools::Itertools;
@ -91,9 +91,7 @@ pub fn newtons_method_helper(
.filter(|(prev, curr)| prev.y.is_finite() && curr.y.is_finite()) .filter(|(prev, curr)| prev.y.is_finite() && curr.y.is_finite())
.filter(|(prev, curr)| prev.y.signum() != curr.y.signum()) .filter(|(prev, curr)| prev.y.signum() != curr.y.signum())
.map(|(start, _)| start.x) .map(|(start, _)| start.x)
.map(|x| newtons_method(f, f_1, x, range, threshold)) .filter_map(|x| newtons_method(f, f_1, x, range, threshold))
.filter(|x| x.is_some())
.map(|x| unsafe { x.unwrap_unchecked() })
.collect() .collect()
} }