---

yaml
---
r: 59930
b: refs/heads/master
c: 02889f7
h: refs/heads/master
v: v3

Author: Sodel-the-Vociferous

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 984180c600b083b272237c0b343bb3e3dd844086
+refs/heads/master: 02889f75072cd3eb75afc4000d15b8174eda6155
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589

trunk/src/libcore/prelude.rs

@@ -31,7 +31,7 @@ pub use io::{print, println};
 /* Reexported types and traits */
 
 pub use clone::Clone;
-pub use cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
+pub use cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater, Equiv};
 pub use container::{Container, Mutable, Map, Set};
 pub use hash::Hash;
 pub use old_iter::{BaseIter, ReverseIter, MutableIter, ExtendedIter, EqIter};

trunk/src/librustc/middle/ty.rs

@@ -2499,15 +2499,12 @@ pub fn type_is_enum(ty: t) -> bool {
 // constructors
 pub fn type_is_c_like_enum(cx: ctxt, ty: t) -> bool {
     match get(ty).sty {
-        ty_enum(did, _) => {
-            let variants = enum_variants(cx, did);
-            if variants.len() == 0 {
-                false
-            } else {
-                variants.all(|v| v.args.len() == 0)
-            }
-        }
-        _ => false
+      ty_enum(did, _) => {
+        let variants = enum_variants(cx, did);
+        let some_n_ary = vec::any(*variants, |v| vec::len(v.args) > 0u);
+        return !some_n_ary;
+      }
+      _ => return false
     }
 }