minor fix

Author: hexqnt

Cargo.lock

@@ -49,10 +49,10 @@ eframe = { version = "0.36.1", default-features = false, features = [
     "glow",
 ] }
 getrandom = { version = "0.3.4", features = ["wasm_js"] }
-wasm-bindgen = "0.2.127"
-wasm-bindgen-futures = "0.4.77"
+wasm-bindgen = "0.2.128"
+wasm-bindgen-futures = "0.4.78"
 web-time = "1.1.0"
-web-sys = { version = "0.3.104", features = [
+web-sys = { version = "0.3.105", features = [
     "Clipboard",
     "Document",
     "Element",

Cargo.toml

@@ -336,20 +336,22 @@ fn parse_points_from_csv_bytes(file_bytes: &[u8]) -> Result<Vec<Point>, String>
         .has_headers(false)
         .flexible(true)
         .delimiter(delimiter)
-        .from_reader(std::io::Cursor::new(normalized));
+        .from_reader(normalized);
 
     let mut points = Vec::new();
-    for (line_index, record_result) in reader.byte_records().enumerate() {
-        let line_number = line_index + 1;
-        let record = record_result
-            .map_err(|error| format!("CSV parse error at line {line_number}: {error}"))?;
-
+    let mut record = csv::ByteRecord::new();
+    let mut line_number = 1;
+    while reader
+        .read_byte_record(&mut record)
+        .map_err(|error| format!("CSV parse error at line {line_number}: {error}"))?
+    {
         if let Some(point) = parse_point_from_clipboard_like_fragments(
             line_number,
             record.iter().map(String::from_utf8_lossy),
         )? {
             points.push(point);
         }
+        line_number += 1;
     }
 
     if points.is_empty() {
@@ -426,11 +428,7 @@ fn spreadsheet_cell_to_text(cell: &Data) -> Cow<'_, str> {
 
 #[cfg(not(target_arch = "wasm32"))]
 fn strip_utf8_bom(file_bytes: &[u8]) -> &[u8] {
-    if file_bytes.starts_with(&UTF8_BOM) {
-        &file_bytes[UTF8_BOM.len()..]
-    } else {
-        file_bytes
-    }
+    file_bytes.strip_prefix(&UTF8_BOM).unwrap_or(file_bytes)
 }
 
 #[cfg(not(target_arch = "wasm32"))]

src/app/file_import.rs

@@ -119,10 +119,11 @@ impl CurveFitApp {
         ParsedSplineInitialKnotY::parse(&self.spline_initial_knot_y_inputs, expected_count)
     }
 }
+
 fn parse_indexed_f64_inputs(inputs: &[String], field_prefix: &str) -> Result<Vec<f64>, String> {
     inputs
         .iter()
         .enumerate()
-        .map(|(index, raw_value)| parse_f64(&format!("{field_prefix}[{index}]"), raw_value))
+        .map(|(index, raw_value)| parse_f64(format_args!("{field_prefix}[{index}]"), raw_value))
         .collect()
 }

src/app/input_parse.rs

@@ -143,9 +143,8 @@ impl ParametricNormalization {
     }
 
     fn transform_polynomial_params(self, values: &mut [f64], direction: ScaleDirection) {
-        let degree = values.len() - 1;
-        for (index, value) in values.iter_mut().enumerate() {
-            let power = (degree - index) as i32;
+        for (power, value) in values.iter_mut().rev().enumerate() {
+            let power = power as i32;
             self.transform_value(value, ParamScale::new(power, -1), direction);
         }
     }
@@ -170,14 +169,11 @@ impl ParametricNormalization {
             return;
         }
 
-        let numerator_len = degree + 1;
-        for (index, value) in values.iter_mut().enumerate().take(numerator_len) {
-            let power = (degree - index) as i32;
-            self.transform_value(value, ParamScale::new(power, -1), direction);
-        }
+        let (numerator, denominator) = values.split_at_mut(degree + 1);
+        self.transform_polynomial_params(numerator, direction);
 
-        for (index, value) in values.iter_mut().enumerate().skip(numerator_len) {
-            let power = (index - degree) as i32;
+        for (index, value) in denominator.iter_mut().enumerate() {
+            let power = (index + 1) as i32;
             self.transform_value(value, ParamScale::new(power, 0), direction);
         }
     }

src/app/normalization.rs

@@ -1,7 +1,7 @@
 //! Парсинг и сериализация текстового и clipboard-представления точек.
 
 use std::borrow::Cow;
-use std::fmt::Write as _;
+use std::fmt::{Display, Write as _};
 
 use egui_plot::PlotPoint;
 
@@ -64,7 +64,7 @@ impl<'a> Iterator for ClipboardNumericTokens<'a> {
     }
 }
 
-pub(super) fn parse_f64(field_name: &str, raw_value: &str) -> Result<f64, String> {
+pub(super) fn parse_f64(field_name: impl Display, raw_value: &str) -> Result<f64, String> {
     let trimmed = raw_value.trim();
     if trimmed.is_empty() {
         return Err(format!("Field '{field_name}' is empty"));
@@ -82,7 +82,7 @@ pub(super) fn parse_f64(field_name: &str, raw_value: &str) -> Result<f64, String
 }
 
 fn parse_line_coordinate(line_number: usize, axis: &str, raw_value: &str) -> Result<f64, String> {
-    parse_f64(&format!("line {line_number} {axis}"), raw_value)
+    parse_f64(format_args!("line {line_number} {axis}"), raw_value)
 }
 
 fn parse_line_point_values(line_number: usize, x_raw: &str, y_raw: &str) -> Result<Point, String> {