lint: fix clippy::pedantic (2 entries)

magistau · magistau · commit 3287de112902 · 2025-07-16T20:24:12.000+03:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,14 +17,6 @@ print_stdout = "warn"
 print_stderr = "allow"
 dbg_macro = "warn"
 pedantic = {level = "warn", priority = -1}
-implicit_clone = "allow"  # 2
-inconsistent_struct_constructor = "allow"  # 2
-match_bool = "allow"  # 2
-no_mangle_with_rust_abi = "allow"  # 2
-struct_excessive_bools = "allow"  # 2
-struct_field_names = "allow"  # 2
-unicode_not_nfc = "allow"  # 2
-unused_self = "allow"  # 2
 case_sensitive_file_extension_comparisons = "allow"  # 3
 cloned_instead_of_copied = "allow"  # 3
 ref_as_ptr = "allow"  # 3
diff --git a/pad/editor/src/backend.rs b/pad/editor/src/backend.rs
@@ -144,7 +144,7 @@ impl WebBackend {
         }
         panic!("Ran out of file handles");
     }
-    fn file<T>(&self, path: &Path, f: impl FnOnce(&[u8]) -> T) -> Result<T, String> {
+    fn file<T>(path: &Path, f: impl FnOnce(&[u8]) -> T) -> Result<T, String> {
         FILES.with(|files| {
             let files = files.borrow();
             files
@@ -251,10 +251,10 @@ impl SysBackend for WebBackend {
         Ok(set.into_iter().collect())
     }
     fn is_file(&self, path: &str) -> Result<bool, String> {
-        Ok(self.file(path.as_ref(), |_| {}).is_ok())
+        Ok(Self::file(path.as_ref(), |_| {}).is_ok())
     }
     fn file_exists(&self, path: &str) -> bool {
-        self.file(path.as_ref(), |_| {}).is_ok()
+        Self::file(path.as_ref(), |_| {}).is_ok()
     }
     fn file_write_all(&self, path: &Path, contents: &[u8]) -> Result<(), String> {
         FILES.with(|files| {
@@ -267,7 +267,7 @@ impl SysBackend for WebBackend {
         Ok(())
     }
     fn file_read_all(&self, path: &Path) -> Result<Vec<u8>, String> {
-        self.file(path, |contents| contents.to_vec())
+        Self::file(path, |contents| contents.to_vec())
     }
     fn open_file(&self, path: &Path, write: bool) -> Result<Handle, String> {
         let handle = self.new_handle();
diff --git a/pad/editor/src/lib.rs b/pad/editor/src/lib.rs
@@ -1391,9 +1391,10 @@ pub fn Editor<'a>(
             EditorMode::Showcase | EditorMode::Pad => "medium-editor",
         };
 
-        let editor_layout = match fullscreen_enabled.get() {
-            true => "fullscreen-editor",
-            false => "normal-editor",
+        let editor_layout = if fullscreen_enabled.get() {
+            "fullscreen-editor"
+        } else {
+            "normal-editor"
         };
 
         format!("editor {editor_size} {editor_layout}")
@@ -1448,13 +1449,7 @@ pub fn Editor<'a>(
                 .unwrap()
                 .unchecked_into::<HtmlBodyElement>()
                 .style()
-                .set_property(
-                    "overflow",
-                    match *s {
-                        true => "hidden",
-                        false => "auto",
-                    },
-                );
+                .set_property("overflow", if *s { "hidden" } else { "auto" });
             if !*s {
                 set_timeout(
                     move || state.update(|state| state.update_line_number_width()),
diff --git a/parser/src/parse.rs b/parser/src/parse.rs
@@ -666,8 +666,8 @@ impl Parser<'_> {
                     let close_span = self.exact(CloseParen.into());
                     validator = Some(FieldValidator {
                         open_span,
-                        close_span,
                         words,
+                        close_span,
                     });
                 }
 
diff --git a/site/src/main.rs b/site/src/main.rs
@@ -630,7 +630,7 @@ fn site() {
                         continue;
                     }
                     threads.push((
-                        path.to_path_buf(),
+                        path.clone(),
                         code.clone(),
                         std::thread::spawn(move || {
                             (
diff --git a/site/src/tutorial.rs b/site/src/tutorial.rs
@@ -144,6 +144,11 @@ impl IntoParam for TutorialPage {
     }
 }
 
+#[expect(
+    clippy::unicode_not_nfc,
+    reason = "the suggested CJK characters don't look as good",
+    // TODO: maybe replace with better "arrows" that don't use characters
+)]
 #[component]
 fn TutorialNav(page: TutorialPage) -> impl IntoView {
     let next = move || {
diff --git a/src/algorithm/path.rs b/src/algorithm/path.rs
@@ -254,8 +254,8 @@ fn path_impl(
         let mut env = PathEnv {
             env,
             neighbors,
-            heuristic,
             is_goal,
+            heuristic,
             args,
         };
 
diff --git a/src/compile/data.rs b/src/compile/data.rs
@@ -581,6 +581,7 @@ impl Compiler {
 
         Ok(())
     }
+    #[expect(clippy::unused_self, reason = "seems to be TBI")]
     pub(super) fn end_enum(&mut self) -> UiuaResult {
         Ok(())
     }
diff --git a/src/compile/mod.rs b/src/compile/mod.rs
@@ -201,6 +201,10 @@ struct CurrentBinding {
 }
 
 /// A scope where names are defined
+#[expect(
+    clippy::struct_excessive_bools,
+    reason = "doesn't seem to be a state machine"
+)]
 #[derive(Debug, Clone)]
 pub(crate) struct Scope {
     kind: ScopeKind,
diff --git a/src/fill.rs b/src/fill.rs
@@ -2,8 +2,8 @@ use crate::{Array, Boxed, Complex, SubSide, Uiua, Value};
 
 pub struct Fill<'a> {
     env: &'a Uiua,
-    value_fill: fn(env: &'a Uiua) -> Option<&'a FillValue>,
-    other_value_fill: fn(env: &'a Uiua) -> Option<&'a FillValue>,
+    value: fn(env: &'a Uiua) -> Option<&'a FillValue>,
+    other_value: fn(env: &'a Uiua) -> Option<&'a FillValue>,
     other_error: &'static str,
 }
 
@@ -44,21 +44,21 @@ impl<'a> Fill<'a> {
     pub fn new(env: &'a Uiua) -> Self {
         Self {
             env,
-            value_fill: Uiua::value_fill,
-            other_value_fill: Uiua::value_unfill,
+            value: Uiua::value_fill,
+            other_value: Uiua::value_unfill,
             other_error: ". An unfill is set, but not a normal fill.",
         }
     }
     pub fn new_un(env: &'a Uiua) -> Self {
         Self {
             env,
-            value_fill: Uiua::value_unfill,
-            other_value_fill: Uiua::value_fill,
+            value: Uiua::value_unfill,
+            other_value: Uiua::value_fill,
             other_error: ". A normal fill is set, but not an unfill.",
         }
     }
     pub fn value(&self) -> Option<&FillValue> {
-        (self.value_fill)(self.env)
+        (self.value)(self.env)
     }
     fn value_map<U>(
         &self,
@@ -178,7 +178,7 @@ impl<'a> Fill<'a> {
                 Some(Value::Complex(_)) => ". A complex fill is set, but it is not a scalar.",
                 Some(Value::Box(_)) => ". A box fill is set, but it is not a scalar.",
                 None => {
-                    if (self.other_value_fill)(self.env).is_some() {
+                    if (self.other_value)(self.env).is_some() {
                         self.other_error
                     } else {
                         ""
@@ -197,7 +197,7 @@ impl<'a> Fill<'a> {
                 }
                 Some(Value::Box(_)) => ". A box fill is set, but the array is not boxed values.",
                 None => {
-                    if (self.other_value_fill)(self.env).is_some() {
+                    if (self.other_value)(self.env).is_some() {
                         self.other_error
                     } else {
                         ""
diff --git a/src/format.rs b/src/format.rs
@@ -674,7 +674,7 @@ impl Formatter<'_> {
             }
             Item::Words(words) => {
                 self.prev_import_function = None;
-                let lines = flip_unsplit_lines(split_words(words.to_vec()));
+                let lines = flip_unsplit_lines(split_words(words.clone()));
                 let extra_newlines = lines.len() > 1 && self.output.ends_with('(') && depth > 0;
                 for (i, line) in lines.into_iter().enumerate() {
                     let line = trim_spaces(&line, true);
diff --git a/src/window.rs b/src/window.rs
@@ -179,6 +179,10 @@ pub fn run_window() {
     .unwrap();
 }
 
+#[expect(
+    clippy::struct_excessive_bools,
+    reason = "doesn't seem to be a state machine"
+)]
 struct App {
     items: Vec<OutputItem>,
     recv: Receiver<Request>,
diff --git a/tests_ffi/src/lib.rs b/tests_ffi/src/lib.rs
@@ -60,13 +60,13 @@ pub unsafe extern "C" fn multi_list(
 }
 
 #[no_mangle]
-pub unsafe fn change_string(s: *mut *const c_char) {
+pub unsafe extern "C" fn change_string(s: *mut *const c_char) {
     let new_str = CString::new("Hello, World!").unwrap();
     *s = new_str.into_raw();
 }
 
 #[no_mangle]
-pub unsafe fn change_string_to_sum(a: c_int, b: c_int, s: *mut *const c_char) {
+pub unsafe extern "C" fn change_string_to_sum(a: c_int, b: c_int, s: *mut *const c_char) {
     let sum = a + b;
     let new_str = CString::new(format!("{a} + {b} = {sum}")).unwrap();
     *s = new_str.into_raw();

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ impl WebBackend {`
`144`	`144`	`}`
`145`	`145`	`panic!("Ran out of file handles");`
`146`	`146`	`}`
`147`		`- fn file<T>(&self, path: &Path, f: impl FnOnce(&[u8]) -> T) -> Result<T, String> {`
	`147`	`+ fn file<T>(path: &Path, f: impl FnOnce(&[u8]) -> T) -> Result<T, String> {`
`148`	`148`	`FILES.with(\|files\| {`
`149`	`149`	`let files = files.borrow();`
`150`	`150`	`files`
`@@ -251,10 +251,10 @@ impl SysBackend for WebBackend {`
`251`	`251`	`Ok(set.into_iter().collect())`
`252`	`252`	`}`
`253`	`253`	`fn is_file(&self, path: &str) -> Result<bool, String> {`
`254`		`- Ok(self.file(path.as_ref(), \|_\| {}).is_ok())`
	`254`	`+ Ok(Self::file(path.as_ref(), \|_\| {}).is_ok())`
`255`	`255`	`}`
`256`	`256`	`fn file_exists(&self, path: &str) -> bool {`
`257`		`- self.file(path.as_ref(), \|_\| {}).is_ok()`
	`257`	`+ Self::file(path.as_ref(), \|_\| {}).is_ok()`
`258`	`258`	`}`
`259`	`259`	`fn file_write_all(&self, path: &Path, contents: &[u8]) -> Result<(), String> {`
`260`	`260`	`FILES.with(\|files\| {`
`@@ -267,7 +267,7 @@ impl SysBackend for WebBackend {`
`267`	`267`	`Ok(())`
`268`	`268`	`}`
`269`	`269`	`fn file_read_all(&self, path: &Path) -> Result<Vec<u8>, String> {`
`270`		`- self.file(path, \|contents\| contents.to_vec())`
	`270`	`+ Self::file(path, \|contents\| contents.to_vec())`
`271`	`271`	`}`
`272`	`272`	`fn open_file(&self, path: &Path, write: bool) -> Result<Handle, String> {`
`273`	`273`	`let handle = self.new_handle();`
Original file line number	Diff line number	Diff line change
`@@ -666,8 +666,8 @@ impl Parser<'_> {`
`666`	`666`	`let close_span = self.exact(CloseParen.into());`
`667`	`667`	`validator = Some(FieldValidator {`
`668`	`668`	`open_span,`
`669`		`- close_span,`
`670`	`669`	`words,`
	`670`	`+ close_span,`
`671`	`671`	`});`
`672`	`672`	`}`
`673`	`673`
Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,7 @@ fn site() {`
`630`	`630`	`continue;`
`631`	`631`	`}`
`632`	`632`	`threads.push((`
`633`		`- path.to_path_buf(),`
	`633`	`+ path.clone(),`
`634`	`634`	`code.clone(),`
`635`	`635`	`std::thread::spawn(move \|\| {`
`636`	`636`	`(`
Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,11 @@ impl IntoParam for TutorialPage {`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`
	`147`	`+#[expect(`
	`148`	`+ clippy::unicode_not_nfc,`
	`149`	`+ reason = "the suggested CJK characters don't look as good",`
	`150`	`+ // TODO: maybe replace with better "arrows" that don't use characters`
	`151`	`+)]`
`147`	`152`	`#[component]`
`148`	`153`	`fn TutorialNav(page: TutorialPage) -> impl IntoView {`
`149`	`154`	`let next = move \|\| {`
Original file line number	Diff line number	Diff line change
`@@ -581,6 +581,7 @@ impl Compiler {`
`581`	`581`
`582`	`582`	`Ok(())`
`583`	`583`	`}`
	`584`	`+ #[expect(clippy::unused_self, reason = "seems to be TBI")]`
`584`	`585`	`pub(super) fn end_enum(&mut self) -> UiuaResult {`
`585`	`586`	`Ok(())`
`586`	`587`	`}`