---

yaml
---
r: 223695
b: refs/heads/beta
c: b952c0e
h: refs/heads/master
i:
  223693: a769f35
  223691: d0c3381
  223687: 6318fae
  223679: 509183a
v: v3

Author: quantheory

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: faf73028c9afe5790e9b4d83a348d93e4a098852
+refs/heads/beta: b952c0e4e9f3c169c6647fd05fef68ae1119865a
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 938f5d7af401e2d8238522fed4a612943b6e77fd
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc/middle/check_static_recursion.rs

@@ -27,6 +27,10 @@ struct CheckCrateVisitor<'a, 'ast: 'a> {
     sess: &'a Session,
     def_map: &'a DefMap,
     ast_map: &'a ast_map::Map<'ast>,
+    // `discriminant_map` is a cache that associates the `NodeId`s of local
+    // variant definitions with the discriminant expression that applies to
+    // each one. If the variant uses the default values (starting from `0`),
+    // then `None` is stored.
     discriminant_map: RefCell<NodeMap<Option<&'ast ast::Expr>>>,
 }
 

branches/beta/src/test/compile-fail/issue-23302.rs

@@ -8,10 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// Check that an enum with recursion in the discriminant throws
+// the appropriate error (rather than, say, blowing the stack).
 enum X {
     A = X::A as isize, //~ ERROR E0265
 }
 
+// Since `Y::B` here defaults to `Y::A+1`, this is also a
+// recursive definition.
 enum Y {
     A = Y::B as isize, //~ ERROR E0265
     B,