Merge branch 'wchar-lossless' into 'master'

make some cast lossless in macro in wchar See merge request redox-os/relibc!1080
2026-03-11 07:20:55 -06:00
parent 07947f96dc c4d667c6bf
commit 36892976bf
1 changed files with 20 additions and 2 deletions
@@ -875,9 +875,27 @@ macro_rules! strtou_impl {
        {
            let new = result.checked_mul(base as $type).and_then(|result| {
                if $negative {
-                    result.checked_sub(digit as $type)
+                    #[cfg(target_arch = "x86")]
+                    {
+                        result.checked_sub(
+                            $type::try_from(digit).expect("single digit never overflows"),
+                        )
+                    }
+                    #[cfg(not(target_arch = "x86"))]
+                    {
+                        result.checked_sub($type::from(digit))
+                    }
                } else {
-                    result.checked_add(digit as $type)
+                    #[cfg(target_arch = "x86")]
+                    {
+                        result.checked_add(
+                            $type::try_from(digit).expect("single digit never overflows"),
+                        )
+                    }
+                    #[cfg(not(target_arch = "x86"))]
+                    {
+                        result.checked_add($type::from(digit))
+                    }
                }
            });
            result = match new {