---

yaml
---
r: 23238
b: refs/heads/master
c: 6d68658
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9f01acacf94b119da674e8f70b828cb4a5fa6485
+refs/heads/master: 6d68658b9a9705d2e4c517d12705a2f64f20e378
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libsyntax/ext/auto_serialize.rs

@@ -885,7 +885,7 @@ fn deser_enum(cx: ext_ctxt, tps: deser_tps_map, e_name: ast::ident,
               e_span: span, variants: ~[ast::variant],
               -d: @ast::expr) -> @ast::expr {
     let ext_cx = cx;
-    let arms: ~[ast::arm] = do vec::from_fn(vec::len(variants)) |vidx| {
+    let mut arms: ~[ast::arm] = do vec::from_fn(vec::len(variants)) |vidx| {
         let variant = variants[vidx];
         let v_span = variant.span;
         let v_name = variant.node.name;
@@ -925,10 +925,19 @@ fn deser_enum(cx: ext_ctxt, tps: deser_tps_map, e_name: ast::ident,
          body: cx.expr_blk(body)}
     };
 
+    let impossible_case = {pats: ~[@{id: cx.next_id(),
+                                     node: ast::pat_wild,
+                                     span: e_span}],
+                        guard: none,
+                        // FIXME #3198: proper error message
+                           body: cx.expr_blk(cx.expr(e_span,
+                                                     ast::expr_fail(none)))};
+    arms += ~[impossible_case];
+
     // Generate code like:
     let e_name = cx.lit_str(e_span, e_name);
     let alt_expr = cx.expr(e_span,
-                           ast::expr_match(#ast{__i}, arms, ast::alt_check));
+                   ast::expr_match(#ast{__i}, arms, ast::alt_exhaustive));
     let var_lambda = #ast{ |__i| $(alt_expr) };
     let read_var = #ast{ $(cx.clone(d)).read_enum_variant($(var_lambda)) };
     let read_lambda = cx.lambda(cx.expr_blk(read_var));