Skip to content

Commit c79c990

Browse files
authored
Rollup merge of #146379 - madsmtm:fix-platform_version-test, r=tgross35
Fix `compare_against_sw_vers` test The `saturating_sub` doesn't actually perform its intended since the version numbers are signed integers (which I changed in a later revision of #138944). Fixes the issue described in #138944 (comment). r? tgross35
2 parents 88b5130 + 23edc4d commit c79c990

File tree

1 file changed

+3
-3
lines changed
  • library/std/src/sys/platform_version/darwin

1 file changed

+3
-3
lines changed

library/std/src/sys/platform_version/darwin/tests.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ fn compare_against_sw_vers() {
3535
assert_eq!(__isOSVersionAtLeast(major, minor, subminor), 1);
3636

3737
// One lower is available
38-
assert_eq!(__isOSVersionAtLeast(major, minor, subminor.saturating_sub(1)), 1);
39-
assert_eq!(__isOSVersionAtLeast(major, minor.saturating_sub(1), subminor), 1);
40-
assert_eq!(__isOSVersionAtLeast(major.saturating_sub(1), minor, subminor), 1);
38+
assert_eq!(__isOSVersionAtLeast(major, minor, (subminor as u32).saturating_sub(1) as i32), 1);
39+
assert_eq!(__isOSVersionAtLeast(major, (minor as u32).saturating_sub(1) as i32, subminor), 1);
40+
assert_eq!(__isOSVersionAtLeast((major as u32).saturating_sub(1) as i32, minor, subminor), 1);
4141

4242
// One higher isn't available
4343
assert_eq!(__isOSVersionAtLeast(major, minor, subminor + 1), 0);

0 commit comments

Comments
 (0)