Use checked_sub

Sergi-Ferrez · Sergi-Ferrez · commit 744dc8c503de · 2024-06-04T16:05:51.000+02:00
diff --git a/src/librustdoc/html/format.rs b/src/librustdoc/html/format.rs
@@ -1439,7 +1439,7 @@ impl clean::FnDecl {
             write!(f, "\n{}", Indent(n + 4))?;
         }
 
-        let last_input_index = self.inputs.values.len() - 1;
+        let last_input_index = self.inputs.values.len().checked_sub(1);
         for (i, input) in self.inputs.values.iter().enumerate() {
             if let Some(selfty) = input.to_self() {
                 match selfty {
@@ -1473,11 +1473,12 @@ impl clean::FnDecl {
                 write!(f, "{}: ", input.name)?;
                 input.type_.print(cx).fmt(f)?;
             }
-            match line_wrapping_indent {
-                None if i == last_input_index => (),
-                None => write!(f, ", ")?,
-                Some(_n) if i == last_input_index => write!(f, ",\n")?,
-                Some(n) => write!(f, ",\n{}", Indent(n + 4))?,
+            match (line_wrapping_indent, last_input_index) {
+                (_, None) => (),
+                (None, Some(last_i)) if i != last_i => write!(f, ", ")?,
+                (None, Some(_)) => (),
+                (Some(n), Some(last_i)) if i != last_i => write!(f, ",\n{}", Indent(n + 4))?,
+                (Some(_), Some(_)) => write!(f, ",\n")?,
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1439,7 +1439,7 @@ impl clean::FnDecl {`
`1439`	`1439`	`write!(f, "\n{}", Indent(n + 4))?;`
`1440`	`1440`	`}`
`1441`	`1441`
`1442`		`- let last_input_index = self.inputs.values.len() - 1;`
	`1442`	`+ let last_input_index = self.inputs.values.len().checked_sub(1);`
`1443`	`1443`	`for (i, input) in self.inputs.values.iter().enumerate() {`
`1444`	`1444`	`if let Some(selfty) = input.to_self() {`
`1445`	`1445`	`match selfty {`
`@@ -1473,11 +1473,12 @@ impl clean::FnDecl {`
`1473`	`1473`	`write!(f, "{}: ", input.name)?;`
`1474`	`1474`	`input.type_.print(cx).fmt(f)?;`
`1475`	`1475`	`}`
`1476`		`- match line_wrapping_indent {`
`1477`		`- None if i == last_input_index => (),`
`1478`		`- None => write!(f, ", ")?,`
`1479`		`- Some(_n) if i == last_input_index => write!(f, ",\n")?,`
`1480`		`- Some(n) => write!(f, ",\n{}", Indent(n + 4))?,`
	`1476`	`+ match (line_wrapping_indent, last_input_index) {`
	`1477`	`+ (_, None) => (),`
	`1478`	`+ (None, Some(last_i)) if i != last_i => write!(f, ", ")?,`
	`1479`	`+ (None, Some(_)) => (),`
	`1480`	`+ (Some(n), Some(last_i)) if i != last_i => write!(f, ",\n{}", Indent(n + 4))?,`
	`1481`	`+ (Some(_), Some(_)) => write!(f, ",\n")?,`
`1481`	`1482`	`}`
`1482`	`1483`	`}`
`1483`	`1484`