lint: fix clippy::pedantic (8-9 entries)

Author: magistau

Cargo.toml

@@ -17,11 +17,6 @@ print_stdout = "warn"
 print_stderr = "allow"
 dbg_macro = "warn"
 pedantic = {level = "warn", priority = -1}
-unnested_or_patterns = "allow"  # 8
-borrow_as_ptr = "allow"  # 9
-explicit_iter_loop = "allow"  # 9
-ignored_unit_patterns = "allow"  # 9
-many_single_char_names = "allow"  # 9
 single_match_else = "allow"  # 11
 manual_string_new = "allow"  # 12
 trivially_copy_pass_by_ref = "allow"  # 12

pad/editor/src/lib.rs

@@ -690,7 +690,7 @@ pub fn Editor<'a>(
                             let first_char = *chars.first().unwrap();
                             let class = char_class(first_char);
                             let mut encountered_space = false;
-                            for &c in chars.iter() {
+                            for &c in &chars {
                                 if c.is_whitespace() && c != '\n'
                                     || char_class(c) == class && !encountered_space
                                 {

pad/editor/src/utils.rs

@@ -1678,7 +1678,7 @@ pub fn element<T: JsCast>(id: &str) -> T {
 pub fn format_insert_file_code(path: &Path, content: Vec<u8>) -> String {
     let function = match path.extension().and_then(|ext| ext.to_str()) {
         Some("ua") => "~",
-        Some("txt") | Some("md") | Some("json") | None => "&fras",
+        Some("txt" | "md" | "json") | None => "&fras",
         _ => "&frab",
     };
 

site/src/markdown.rs

@@ -22,7 +22,7 @@ pub fn Fetch<S: Into<String>, F: Fn(&str) -> View + 'static>(src: S, f: F) -> im
     let (src, _) = create_signal(src);
     let once = create_resource(
         || (),
-        move |_| async move { fetch(&src.get_untracked()).await.unwrap() },
+        move |()| async move { fetch(&src.get_untracked()).await.unwrap() },
     );
     view! {{
         move || match once.get() {
@@ -345,7 +345,7 @@ fn node_html<'a>(node: &'a AstNode<'a>) -> String {
                     line.push_str(&" ".repeat(max_len - line_len));
                 }
                 match comp.load_str(line).and_then(|comp| env.run_compiler(comp)) {
-                    Ok(_) => {
+                    Ok(()) => {
                         let values = env.take_stack();
                         if !values.is_empty() && !values.iter().any(|v| v.shape.elements() > 200) {
                             let formatted: Vec<String> = values.iter().map(Value::show).collect();
@@ -396,7 +396,7 @@ fn node_html<'a>(node: &'a AstNode<'a>) -> String {
             let tag = if is_header { "th" } else { "td" };
             children_iter
                 .try_fold(String::new(), |mut acc, cur| {
-                    write!(&mut acc, "<{tag}>{cur}</{tag}>").map(|_| acc)
+                    write!(&mut acc, "<{tag}>{cur}</{tag}>").map(|()| acc)
                 })
                 .expect("write! on a String shouldn't fail")
         }
@@ -468,7 +468,7 @@ fn text_code_blocks() {
                 .load_str(&block)
                 .and_then(|comp| env.run_compiler(comp));
             let failure_report = match res {
-                Ok(_) => comp
+                Ok(()) => comp
                     .take_diagnostics()
                     .into_iter()
                     .next()

src/algorithm/dyadic/search.rs

@@ -509,9 +509,7 @@ impl<T: ArrayValue> Array<T> {
             if haystack.shape.iter().all(|&d| d > 0) {
                 'windows: loop {
                     // Reset curr
-                    for i in curr.iter_mut() {
-                        *i = 0;
-                    }
+                    curr.fill(0);
                     // Search the window whose top-left is the current corner
                     'items: loop {
                         // Get index for the current item in the haystack

src/algorithm/encode.rs

@@ -268,10 +268,7 @@ impl Value {
                 let mut rows = Vec::new();
                 for result in reader.records() {
                     let record = result.map_err(|e| env.error(e))?;
-                    let mut row = EcoVec::new();
-                    for field in record.iter() {
-                        row.push(Boxed(field.into()));
-                    }
+                    let row: EcoVec<_> = record.iter().map(|x| Boxed(x.into())).collect();
                     rows.push(Array::new(row.len(), row));
                 }
                 Array::from_row_arrays(rows, env).map(Into::into)

src/algorithm/ga.rs

@@ -367,9 +367,9 @@ fn fast_dyadic_complex(
         drop(b);
         for chunk in a.data.as_mut_slice().chunks_exact_mut(2) {
             let [ar, ai] = [chunk[0], chunk[1]];
-            let [r, i] = f(ar, ai, ar, ai);
-            chunk[0] = r;
-            chunk[1] = i;
+            let [real, imag] = f(ar, ai, ar, ai);
+            chunk[0] = real;
+            chunk[1] = imag;
         }
         Ok(a)
     } else {
@@ -381,29 +381,29 @@ fn fast_dyadic_complex(
                     .zip(b.data.as_mut_slice().chunks_exact_mut(2))
                 {
                     let [ar, ai, br, bi] = [a[0], a[1], b[0], b[1]];
-                    let [r, i] = f(ar, ai, br, bi);
-                    b[0] = r;
-                    b[1] = i;
+                    let [real, imag] = f(ar, ai, br, bi);
+                    b[0] = real;
+                    b[1] = imag;
                 }
                 Ok(b)
             }
             (_, [2]) => {
                 let [br, bi] = [b.data[0], b.data[1]];
                 for a in a.data.as_mut_slice().chunks_exact_mut(2) {
                     let [ar, ai] = [a[0], a[1]];
-                    let [r, i] = f(ar, ai, br, bi);
-                    a[0] = r;
-                    a[1] = i;
+                    let [real, imag] = f(ar, ai, br, bi);
+                    a[0] = real;
+                    a[1] = imag;
                 }
                 Ok(a)
             }
             ([2], _) => {
                 let [ar, ai] = [a.data[0], a.data[1]];
                 for b in b.data.as_mut_slice().chunks_exact_mut(2) {
                     let [br, bi] = [b[0], b[1]];
-                    let [r, i] = f(ar, ai, br, bi);
-                    b[0] = r;
-                    b[1] = i;
+                    let [real, imag] = f(ar, ai, br, bi);
+                    b[0] = real;
+                    b[1] = imag;
                 }
                 Ok(b)
             }

src/algorithm/media.rs

@@ -849,6 +849,7 @@ builtin_params!(
     (Camera, "The position of the camera"),
 );
 
+#[expect(clippy::many_single_char_names, reason = "TODO")]
 pub(crate) fn voxels(val: &Value, env: &mut Uiua) -> UiuaResult<Value> {
     let args = take(&mut env.rt.set_args);
     let converted: Array<f64>;
@@ -1482,7 +1483,7 @@ fn layout_text_impl(size: Value, text: Value, env: &mut Uiua) -> UiuaResult<Valu
         let mut canvas_data = if let Some(bg) = bg {
             let color = match &*bg.shape {
                 [] | [1] => [bg.data[0], bg.data[0], bg.data[0], 1.0],
-                [3] | [4] => {
+                [3 | 4] => {
                     let alpha = bg.data.get(3).copied().unwrap_or(1.0);
                     [bg.data[0], bg.data[1], bg.data[2], alpha]
                 }

src/algorithm/monadic/mod.rs

@@ -893,8 +893,8 @@ impl<T: ArrayValue> Array<T> {
             for i in 0..chunk_row_count / 2 {
                 let left = i * chunk_row_len;
                 let right = (chunk_row_count - i - 1) * chunk_row_len;
-                let left = &mut data[left] as *mut T;
-                let right = &mut data[right] as *mut T;
+                let left = &raw mut data[left];
+                let right = &raw mut data[right];
                 unsafe {
                     ptr::swap_nonoverlapping(left, right, chunk_row_len);
                 }
@@ -2060,7 +2060,7 @@ impl Array<f64> {
             let max = r.max(g).max(b);
             let min = r.min(g).min(b);
             let delta = max - min;
-            let h = if delta == 0.0 {
+            let hue = if delta == 0.0 {
                 0.0
             } else {
                 (TAU * if max == r {
@@ -2071,11 +2071,11 @@ impl Array<f64> {
                     (r - g) / delta + 4.0
                 }) / 6.0
             };
-            let s = if max == 0.0 { 0.0 } else { 1.0 - min / max };
-            let v = max;
-            rgb[0] = h;
-            rgb[1] = s;
-            rgb[2] = v;
+            let sat = if max == 0.0 { 0.0 } else { 1.0 - min / max };
+            let val = max;
+            rgb[0] = hue;
+            rgb[1] = sat;
+            rgb[2] = val;
         }
         self.meta.take_sorted_flags();
         self.validate();
@@ -2092,10 +2092,10 @@ impl Array<f64> {
         }
         let channels = *self.shape.last().unwrap();
         for hsv in self.data.as_mut_slice().chunks_exact_mut(channels) {
-            let [h, s, v, ..] = *hsv else {
+            let [hue, sat, val, ..] = *hsv else {
                 unreachable!();
             };
-            let [r, g, b] = hsv_to_rgb(h, s, v);
+            let [r, g, b] = hsv_to_rgb(hue, sat, val);
             hsv[0] = r;
             hsv[1] = g;
             hsv[2] = b;
@@ -2106,20 +2106,22 @@ impl Array<f64> {
     }
 }
 
-pub(crate) fn hsv_to_rgb(h: f64, s: f64, v: f64) -> [f64; 3] {
-    let h = h / TAU * 6.0;
-    let i = h.floor() as isize;
-    let f = h - i as f64;
-    let p = v * (1.0 - s);
-    let q = v * (1.0 - f * s);
-    let t = v * (1.0 - (1.0 - f) * s);
-    match i.rem_euclid(6) {
-        0 => [v, t, p],
-        1 => [q, v, p],
-        2 => [p, v, t],
-        3 => [p, q, v],
-        4 => [t, p, v],
-        _ => [v, p, q],
+pub(crate) fn hsv_to_rgb(hue: f64, sat: f64, val: f64) -> [f64; 3] {
+    let hue = hue / TAU * 6.0;
+    let sect = hue.floor() as isize;
+    let f = hue - sect as f64;
+    let chroma = val * sat;
+    let min = val - chroma;
+    let mid1 = val - f * chroma;
+    let mid0 = val - (1.0 - f) * chroma;
+    match sect.rem_euclid(6) {
+        0 => [val, mid0, min],
+        1 => [mid1, val, min],
+        2 => [min, val, mid0],
+        3 => [min, mid1, val],
+        4 => [mid0, min, val],
+        5 => [val, min, mid1],
+        _ => unreachable!(),
     }
 }
 

src/algorithm/reduce.rs

@@ -833,7 +833,7 @@ where
                 return arr;
             }
             let mut acc = arr.data[0];
-            for val in arr.data.as_mut_slice()[1..].iter_mut() {
+            for val in &mut arr.data.as_mut_slice()[1..] {
                 acc = f(acc, *val);
                 *val = acc;
             }
@@ -1018,10 +1018,8 @@ where
                 return arr;
             }
             let mut acc = arr.data[0];
-            for val in arr.data.as_mut_slice()[1..].iter_mut() {
-                let temp = *val;
-                *val = f(acc, *val);
-                acc = temp;
+            for val in &mut arr.data.as_mut_slice()[1..] {
+                acc = std::mem::replace(val, f(acc, *val));
             }
             arr
         }