Merge branch 'RustPython:main' into libffi-upgrade

arihant2math · web-flow · commit b10ec4c839b8 · 2025-05-16T23:09:00.000-07:00
diff --git a/compiler/literal/src/float.rs b/compiler/literal/src/float.rs
@@ -55,6 +55,7 @@ pub fn format_fixed(precision: usize, magnitude: f64, case: Case, alternate_form
     match magnitude {
         magnitude if magnitude.is_finite() => {
             let point = decimal_point_or_empty(precision, alternate_form);
+            let precision = std::cmp::min(precision, u16::MAX as usize);
             format!("{magnitude:.precision$}{point}")
         }
         magnitude if magnitude.is_nan() => format_nan(case),
diff --git a/vm/src/stdlib/io.rs b/vm/src/stdlib/io.rs
@@ -259,6 +259,9 @@ mod _io {
         }
 
         fn write(&mut self, data: &[u8]) -> Option<u64> {
+            if data.is_empty() {
+                return Some(0);
+            }
             let length = data.len();
             self.cursor.write_all(data).ok()?;
             Some(length as u64)

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ pub fn format_fixed(precision: usize, magnitude: f64, case: Case, alternate_form`
`55`	`55`	`match magnitude {`
`56`	`56`	`magnitude if magnitude.is_finite() => {`
`57`	`57`	`let point = decimal_point_or_empty(precision, alternate_form);`
	`58`	`+ let precision = std::cmp::min(precision, u16::MAX as usize);`
`58`	`59`	`format!("{magnitude:.precision$}{point}")`
`59`	`60`	`}`
`60`	`61`	`magnitude if magnitude.is_nan() => format_nan(case),`
Original file line number	Diff line number	Diff line change
`@@ -259,6 +259,9 @@ mod _io {`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`fn write(&mut self, data: &[u8]) -> Option<u64> {`
	`262`	`+ if data.is_empty() {`
	`263`	`+ return Some(0);`
	`264`	`+ }`
`262`	`265`	`let length = data.len();`
`263`	`266`	`self.cursor.write_all(data).ok()?;`
`264`	`267`	`Some(length as u64)`