lint: fix clippy::pedantic (5 entries)

magistau · magistau · commit 18bb3c4d9d03 · 2025-07-16T20:24:12.000+03:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,10 +17,6 @@ print_stdout = "warn"
 print_stderr = "allow"
 dbg_macro = "warn"
 pedantic = {level = "warn", priority = -1}
-doc_markdown = "allow"  # 5
-match_wildcard_for_single_variants = "allow"  # 5
-needless_continue = "allow"  # 5
-range_plus_one = "allow"  # 5
 if_not_else = "allow"  # 6
 manual_let_else = "allow"  # 6
 single_char_pattern = "allow"  # 6
diff --git a/parser/src/lex.rs b/parser/src/lex.rs
@@ -1351,7 +1351,7 @@ impl<'a> Lexer<'a> {
                     while self.next_char_exact(" ") || self.next_char_exact("\t") {}
                     self.end(Spaces, start)
                 }
-                c if c.chars().all(|c| c.is_whitespace()) => continue,
+                c if c.chars().all(|c| c.is_whitespace()) => {}
                 c => {
                     if c.chars().count() == 1 {
                         let c = c.chars().next().unwrap();
diff --git a/parser/src/parse.rs b/parser/src/parse.rs
@@ -386,9 +386,7 @@ impl Parser<'_> {
             loop {
                 if let Some(ident) = self.ident() {
                     items.push(ident);
-                } else if self.spaces().is_some() {
-                    continue;
-                } else {
+                } else if self.spaces().is_none() {
                     break;
                 }
             }
diff --git a/parser/src/split.rs b/parser/src/split.rs
@@ -280,7 +280,7 @@ pub fn split_name(name: &str) -> Option<Vec<(PrimComponent, &str)>> {
                         'p' => Primitive::Pop,
                         _ => unreachable!(),
                     };
-                    prims.push((prim.into(), &sub_name[i..i + 1]))
+                    prims.push((prim.into(), &sub_name[i..=i]))
                 }
                 start += len;
                 continue 'outer;
@@ -346,7 +346,7 @@ pub fn split_name(name: &str) -> Option<Vec<(PrimComponent, &str)>> {
                         'p' => Primitive::Pop,
                         _ => unreachable!(),
                     };
-                    prims.push((prim.into(), &sub_name[i..i + 1]))
+                    prims.push((prim.into(), &sub_name[i..=i]))
                 }
                 end -= len;
                 continue 'outer;
@@ -364,7 +364,7 @@ pub fn split_name(name: &str) -> Option<Vec<(PrimComponent, &str)>> {
                         'f' => Primitive::Fix,
                         _ => unreachable!(),
                     };
-                    prims.push((prim.into(), &sub_name[i..i + 1]))
+                    prims.push((prim.into(), &sub_name[i..=i]))
                 }
                 end -= len;
                 continue 'outer;
diff --git a/src/algorithm/dyadic/combine.rs b/src/algorithm/dyadic/combine.rs
@@ -1070,7 +1070,7 @@ impl Value {
                         Value::Char(_) => {
                             return Err(ctx.error("Cannot combine number and character arrays"))
                         }
-                        _ => {}
+                        Value::Byte(_) => {}
                     }
                 }
                 row_values = values.into_iter();
@@ -1121,7 +1121,7 @@ impl Value {
                         Value::Complex(_) => {
                             return Err(ctx.error("Cannot combine character and complex arrays"))
                         }
-                        _ => {}
+                        Value::Char(_) => {}
                     }
                 }
                 row_values = values.into_iter();
diff --git a/src/algorithm/dyadic/mod.rs b/src/algorithm/dyadic/mod.rs
@@ -395,7 +395,7 @@ impl<T: ArrayValue> Array<T> {
                 new_shape.extend_from_slice(&self.shape);
                 self.shape = new_shape.into();
             }
-            _ => {}
+            Ordering::Equal => {}
         }
 
         // If converting to rank 0, the rank-matching process
@@ -459,7 +459,7 @@ impl Value {
         if irank >= 0 {
             // Positive rank
             if rank >= shape.len() {
-                for _ in 0..rank - shape.len() + 1 {
+                for _ in 0..=rank - shape.len() {
                     shape.prepend(1);
                 }
             } else {
diff --git a/src/algorithm/map.rs b/src/algorithm/map.rs
@@ -446,13 +446,13 @@ impl MapKeys {
                             &key_data[key_index * key_row_len..(key_index + 1) * key_row_len];
                         if cell_key[0].is_any_tombstone() {
                             continue;
-                        } else if cell_key[0].is_any_empty_cell() {
+                        }
+                        if cell_key[0].is_any_empty_cell() {
                             key_index = orig;
                             break false;
-                        } else if ArrayCmpSlice(cell_key) == ArrayCmpSlice(&key.data) {
+                        }
+                        if ArrayCmpSlice(cell_key) == ArrayCmpSlice(&key.data) {
                             break true;
-                        } else {
-                            continue;
                         }
                     }
                 } else {
diff --git a/src/algorithm/media.rs b/src/algorithm/media.rs
@@ -31,13 +31,13 @@ pub enum SmartOutput {
 const MIN_AUTO_IMAGE_DIM: usize = 30;
 
 impl SmartOutput {
-    /// Convert a value to a SmartOutput
+    /// Convert a value to a `SmartOutput`
     ///
     /// Animations default to GIF
     pub fn from_value(value: Value, frame_rate: f64, backend: &dyn SysBackend) -> Self {
         Self::from_value_impl(value, frame_rate, false, backend)
     }
-    /// Convert a value to a SmartOutput
+    /// Convert a value to a `SmartOutput`
     ///
     /// Animations default to APNG
     pub fn from_value_prefer_apng(value: Value, frame_rate: f64, backend: &dyn SysBackend) -> Self {
diff --git a/src/array.rs b/src/array.rs
@@ -603,7 +603,7 @@ impl<T: ArrayValue> Array<T> {
             row.meta.take_label();
             return row;
         }
-        let row_count: usize = self.shape[..depth + 1].iter().product();
+        let row_count: usize = self.shape[..=depth].iter().product();
         if row >= row_count {
             panic!("row index out of bounds: {row} >= {row_count}");
         }
diff --git a/src/compile/data.rs b/src/compile/data.rs
@@ -434,7 +434,7 @@ impl Compiler {
         };
         for field in &fields {
             match field.init.as_ref().map(|sn| sn.sig.args()) {
-                Some(0) => continue,
+                Some(0) => {}
                 Some(1) | None => {
                     constr_comment.push(' ');
                     constr_comment.push_str(&field.name);
diff --git a/src/cowslice.rs b/src/cowslice.rs
@@ -479,7 +479,7 @@ impl<T: Clone> IntoIterator for CowSlice<T> {
     }
 }
 
-/// An iterator over a CowSlice
+/// An iterator over a `CowSlice`
 pub struct CowSliceIntoIter<T> {
     data: EcoVec<T>,
     start: usize,
diff --git a/src/ffi.rs b/src/ffi.rs
@@ -1192,7 +1192,7 @@ mod enabled {
                         }
                     },
                     FfiType::Void => return Err("Cannot have void fields in a struct".into()),
-                    _ => {
+                    FfiType::List { .. } => {
                         return Err(format!(
                             "Invalid or unsupported struct field {i} type {field}"
                         ))
diff --git a/src/grid_fmt.rs b/src/grid_fmt.rs
@@ -86,6 +86,10 @@ pub trait GridFmt: Sized {
         rows.map(|row| row.len()).max().unwrap_or(0)
     }
     /// Get SoA rows
+    #[expect(
+        clippy::doc_markdown,
+        reason = "SoA is just an acronym, not a type/trait name"
+    )]
     fn soa_rows(_arr: &Array<Self>) -> Option<Vec<(&EcoString, &Value)>> {
         None
     }
diff --git a/src/lsp.rs b/src/lsp.rs
@@ -2082,7 +2082,7 @@ mod server {
                     Span::Code(span) => path_locs(span, &path)?,
                     Span::Builtin => err.meta.trace.iter().find_map(|frame| match &frame.span {
                         Span::Code(span) => Some(span),
-                        _ => None,
+                        Span::Builtin => None,
                     })?,
                 };
                 Some(uiua_span_to_lsp(span, &doc.asm.inputs))
diff --git a/src/run.rs b/src/run.rs
@@ -1744,7 +1744,7 @@ impl Uiua {
 
 /// A trait for types that can be used as argument specifiers for [`Uiua::pop`]
 ///
-/// If the stack is empty, the error message will be "Stack was empty when getting {arg_name}"
+/// If the stack is empty, the error message will be "Stack was empty when getting {`arg_name`}"
 pub trait StackArg {
     /// Get the name of the argument
     fn arg_name(self) -> String;
diff --git a/src/sys/native.rs b/src/sys/native.rs
@@ -359,7 +359,7 @@ impl SysBackend for NativeSys {
             match b {
                 #[cfg(feature = "raw_mode")]
                 b'\r' if rawrrr::is_raw() => break,
-                b'\r' => continue,
+                b'\r' => {}
                 b'\n' | 3 => break,
                 b => buffer.push(b),
             }

Original file line number	Diff line number	Diff line change
`@@ -1351,7 +1351,7 @@ impl<'a> Lexer<'a> {`
`1351`	`1351`	`while self.next_char_exact(" ") \|\| self.next_char_exact("\t") {}`
`1352`	`1352`	`self.end(Spaces, start)`
`1353`	`1353`	`}`
`1354`		`- c if c.chars().all(\|c\| c.is_whitespace()) => continue,`
	`1354`	`+ c if c.chars().all(\|c\| c.is_whitespace()) => {}`
`1355`	`1355`	`c => {`
`1356`	`1356`	`if c.chars().count() == 1 {`
`1357`	`1357`	`let c = c.chars().next().unwrap();`
Original file line number	Diff line number	Diff line change
`@@ -386,9 +386,7 @@ impl Parser<'_> {`
`386`	`386`	`loop {`
`387`	`387`	`if let Some(ident) = self.ident() {`
`388`	`388`	`items.push(ident);`
`389`		`- } else if self.spaces().is_some() {`
`390`		`- continue;`
`391`		`- } else {`
	`389`	`+ } else if self.spaces().is_none() {`
`392`	`390`	`break;`
`393`	`391`	`}`
`394`	`392`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1070,7 +1070,7 @@ impl Value {`
`1070`	`1070`	`Value::Char(_) => {`
`1071`	`1071`	`return Err(ctx.error("Cannot combine number and character arrays"))`
`1072`	`1072`	`}`
`1073`		`- _ => {}`
	`1073`	`+ Value::Byte(_) => {}`
`1074`	`1074`	`}`
`1075`	`1075`	`}`
`1076`	`1076`	`row_values = values.into_iter();`
`@@ -1121,7 +1121,7 @@ impl Value {`
`1121`	`1121`	`Value::Complex(_) => {`
`1122`	`1122`	`return Err(ctx.error("Cannot combine character and complex arrays"))`
`1123`	`1123`	`}`
`1124`		`- _ => {}`
	`1124`	`+ Value::Char(_) => {}`
`1125`	`1125`	`}`
`1126`	`1126`	`}`
`1127`	`1127`	`row_values = values.into_iter();`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ impl<T: ArrayValue> Array<T> {`
`395`	`395`	`new_shape.extend_from_slice(&self.shape);`
`396`	`396`	`self.shape = new_shape.into();`
`397`	`397`	`}`
`398`		`- _ => {}`
	`398`	`+ Ordering::Equal => {}`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`// If converting to rank 0, the rank-matching process`
`@@ -459,7 +459,7 @@ impl Value {`
`459`	`459`	`if irank >= 0 {`
`460`	`460`	`// Positive rank`
`461`	`461`	`if rank >= shape.len() {`
`462`		`- for _ in 0..rank - shape.len() + 1 {`
	`462`	`+ for _ in 0..=rank - shape.len() {`
`463`	`463`	`shape.prepend(1);`
`464`	`464`	`}`
`465`	`465`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -603,7 +603,7 @@ impl<T: ArrayValue> Array<T> {`
`603`	`603`	`row.meta.take_label();`
`604`	`604`	`return row;`
`605`	`605`	`}`
`606`		`- let row_count: usize = self.shape[..depth + 1].iter().product();`
	`606`	`+ let row_count: usize = self.shape[..=depth].iter().product();`
`607`	`607`	`if row >= row_count {`
`608`	`608`	`panic!("row index out of bounds: {row} >= {row_count}");`
`609`	`609`	`}`