Skip to content

Commit d3c773e

Browse files
committed
---
yaml --- r: 193567 b: refs/heads/beta c: 4a0c7eb h: refs/heads/master i: 193565: 2ab842e 193563: 6cce6b5 193559: 04d9084 193551: 47a93af 193535: dba2ce2 v: v3
1 parent 9be833e commit d3c773e

File tree

4 files changed

+2
-7
lines changed

4 files changed

+2
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 97ca2a1ee919d740ace6f405958beb7b4137e5d6
34+
refs/heads/beta: 4a0c7ebc87b24ca66c1e2810be43e1d89a9488eb
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
3737
refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6

branches/beta/configure

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,10 +430,6 @@ 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-
;;
437433
# We do not detect other OS such as XP/2003 using 64 bit using uname.
438434
# 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.
439435
*)

branches/beta/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/beta/src/test/parse-fail/issue-5806.rs

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

1111
// ignore-windows
1212
// ignore-freebsd
13-
// ignore-openbsd
1413

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

0 commit comments

Comments
 (0)