Skip to content

Commit 0092e35

Browse files
committed
---
yaml --- r: 189748 b: refs/heads/try c: ead9ab8 h: refs/heads/master v: v3
1 parent 0b39608 commit 0092e35

File tree

5 files changed

+15
-3
lines changed

5 files changed

+15
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: f899513a30165946a75ff7f515ab37a226e72172
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 270a677d4d698916f5ad103f0afc3c070b8dbeb4
5-
refs/heads/try: 52124d7c807404a551c499a43736722ade9d9890
5+
refs/heads/try: ead9ab84b80ba3b172d529b1d2a2917bb05b4820
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/configure

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,10 @@ case $CFG_OSTYPE in
430430
CFG_CPUTYPE=x86_64
431431
;;
432432

433+
# Win 8 # uname -s on 64-bit cygwin does not contain WOW64, so simply use uname -m to detect arch (works in my install)
434+
CYGWIN_NT-6.3)
435+
CFG_OSTYPE=pc-windows-gnu
436+
;;
433437
# We do not detect other OS such as XP/2003 using 64 bit using uname.
434438
# If we want to in the future, we will need to use Cygwin - Chuck's csih helper in /usr/lib/csih/winProductName.exe or alternative.
435439
*)

branches/try/src/libstd/num/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1633,7 +1633,7 @@ mod tests {
16331633
assert_eq!((3 as $T).is_power_of_two(), false);
16341634
assert_eq!((4 as $T).is_power_of_two(), true);
16351635
assert_eq!((5 as $T).is_power_of_two(), false);
1636-
assert!(($T::MAX / 2 + 1).is_power_of_two(), true);
1636+
assert_eq!(($T::MAX / 2 + 1).is_power_of_two(), true);
16371637
}
16381638
)
16391639
}

branches/try/src/libtest/lib.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1109,7 +1109,14 @@ impl Bencher {
11091109
return summ5;
11101110
}
11111111

1112-
n *= 2;
1112+
// If we overflow here just return the results so far. We check a
1113+
// multiplier of 10 because we're about to multiply by 2 and the
1114+
// next iteration of the loop will also multiply by 5 (to calculate
1115+
// the summ5 result)
1116+
n = match n.checked_mul(10) {
1117+
Some(_) => n * 2,
1118+
None => return summ5,
1119+
};
11131120
}
11141121
}
11151122
}

branches/try/src/test/parse-fail/issue-5806.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
// ignore-windows
1212
// ignore-freebsd
13+
// ignore-openbsd
1314

1415
#[path = "../compile-fail"]
1516
mod foo; //~ ERROR: a directory

0 commit comments

Comments
 (0)