---

yaml
---
r: 33533
b: refs/heads/snap-stage3
c: a369a78
h: refs/heads/master
i:
  33531: 8d8d144
v: v3

Author: pcwalton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: ed48e76e772b6684b9d5e4ce753c3f493c230d62
+refs/heads/snap-stage3: a369a7881f2196e359fb9d4cb20cf5d2bb0da6f8
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/doc/tutorial-borrowed-ptr.md

@@ -698,7 +698,7 @@ is B, the function body. Both of the second two parameters `a` and `b`
 share the same lifetime, `r`, which is a lifetime parameter of
 `select_based_on_unit_circle()`. The caller will infer the
 intersection of these two lifetimes as the lifetime of the returned
-value, and hence the return value of `select()` will be assigned a
+value, and hence the return value of `shape()` will be assigned a
 lifetime of B. This will in turn lead to a compilation error, because
 `select_based_on_unit_circle()` is supposed to return a value with the
 lifetime `r`.

branches/snap-stage3/mk/tests.mk

@@ -141,13 +141,13 @@ tidy:
 		@$(call E, check: formatting)
 		$(Q)find $(S)src -name '*.r[sc]' \
 		| grep '^$(S)src/test' -v \
-		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
+		| xargs -n 10 python $(S)src/etc/tidy.py
 		$(Q)find $(S)src/etc -name '*.py' \
-		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
+		| xargs -n 10 python $(S)src/etc/tidy.py
 		$(Q)echo $(ALL_CS) \
-	  	| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
+	  	| xargs -n 10 python $(S)src/etc/tidy.py
 		$(Q)echo $(ALL_HS) \
-	  	| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
+	  	| xargs -n 10 python $(S)src/etc/tidy.py
 
 endif
 

branches/snap-stage3/src/libstd/sort.rs

@@ -921,7 +921,6 @@ mod test_tim_sort {
 
     #[test]
     #[should_fail]
-    #[cfg(unix)]
     fn crash_test() {
         let rng = rand::Rng();
         let mut arr = do vec::from_fn(1000) |_i| {

branches/snap-stage3/src/rustc/middle/ty.rs

@@ -387,6 +387,11 @@ type ctxt =
       deriving_struct_methods: HashMap<ast::def_id,
                                        @~[typeck::method_origin]>,
 
+      // The outer vector here describes each enum variant, while the inner
+      // nested vector describes each enum variant argument.
+      deriving_enum_methods: HashMap<ast::def_id,
+                                     @~[@~[typeck::method_origin]]>,
+
       // A mapping from the def ID of a method that was automatically derived
       // to information about it.
       automatically_derived_methods: HashMap<ast::def_id, DerivedMethodInfo>,
@@ -959,6 +964,7 @@ fn mk_ctxt(s: session::Session,
       provided_method_sources: HashMap(),
       supertraits: HashMap(),
       deriving_struct_methods: HashMap(),
+      deriving_enum_methods: HashMap(),
       automatically_derived_methods: HashMap(),
       automatically_derived_methods_for_impl: HashMap()}
 }

branches/snap-stage3/src/rustc/middle/typeck/deriving.rs

@@ -113,6 +113,48 @@ impl DerivingChecker {
         tcx.deriving_struct_methods.insert(local_def(impl_id), field_info);
     }
 
+    fn check_deriving_for_enum(enum_def_id: def_id,
+                               enum_substs: &substs,
+                               trait_ref: @trait_ref,
+                               impl_id: node_id,
+                               impl_span: span) {
+        let tcx = self.crate_context.tcx;
+        let enum_methods = dvec::DVec();
+        let variants = ty::substd_enum_variants(
+            tcx, enum_def_id, enum_substs);
+        for variants.each |enum_variant_info| {
+            let variant_methods = dvec::DVec();
+            for enum_variant_info.args.eachi |i, variant_arg_type| {
+                match self.check_deriving_for_substructure_type(
+                        *variant_arg_type, trait_ref, impl_span) {
+                    Some(method_target_def_id) => {
+                        variant_methods.push(method_static(
+                            method_target_def_id));
+                    }
+                    None => {
+                        let trait_str = pprust::path_to_str(
+                            trait_ref.path, tcx.sess.parse_sess.interner);
+                        tcx.sess.span_err(impl_span,
+                                          fmt!("cannot automatically derive \
+                                                an implementation for `%s`: \
+                                                argument %u of variant `%s` \
+                                                does not implement the trait \
+                                                `%s`",
+                                               trait_str,
+                                               i + 1,
+                                               tcx.sess.str_of(
+                                                    enum_variant_info.name),
+                                               trait_str));
+                    }
+                }
+            }
+            enum_methods.push(@dvec::unwrap(move variant_methods));
+        }
+
+        let enum_methods = @dvec::unwrap(move enum_methods);
+        tcx.deriving_enum_methods.insert(local_def(impl_id), enum_methods);
+    }
+
     fn check_deriving(crate: @crate) {
         let tcx = self.crate_context.tcx;
         visit_crate(*crate, (), mk_simple_visitor(@{
@@ -123,8 +165,13 @@ impl DerivingChecker {
                         let superty = ty::lookup_item_type(
                             tcx, local_def(item.id)).ty;
                         match ty::get(superty).sty {
-                            ty_enum(_def_id, _substs) => {
-                                // XXX: Handle enums.
+                            ty_enum(def_id, ref substs) => {
+                                self.check_deriving_for_enum(
+                                    def_id,
+                                    substs,
+                                    trait_ref,
+                                    item.id,
+                                    item.span);
                             }
                             ty_class(def_id, ref substs) => {
                                 self.check_deriving_for_struct(

branches/snap-stage3/src/test/compile-fail/enum-deriving-incomplete.rs

@@ -0,0 +1,24 @@
+trait MyEq {
+    pure fn eq(other: &self) -> bool;
+}
+
+struct A {
+    x: int
+}
+
+enum B {
+    C(A),
+    D(A),
+    E(A)
+}
+
+impl B : MyEq;
+//~^ ERROR cannot automatically derive
+//~^^ ERROR cannot automatically derive
+//~^^^ ERROR cannot automatically derive
+
+fn main() {
+    let c = C(A { x: 15 });
+    assert c.eq(&c);
+}
+