---

yaml
---
r: 33343
b: refs/heads/snap-stage3
c: c5b82a6
h: refs/heads/master
i:
  33341: 17bffb0
  33339: 6707467
  33335: 7e78445
  33327: a981299
  33311: 4ce96c0
  33279: 1ee2f15
v: v3

Author: catamorphism

[refs]

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

branches/snap-stage3/src/test/compile-fail/issue-3668-2.rs

@@ -0,0 +1,5 @@
+fn f(x:int) {
+    const child: int = x + 1; //~ ERROR attempt to use a non-constant value in a constant
+}
+
+fn main() {}

branches/snap-stage3/src/test/run-pass/issue-3668.rs renamed to branches/snap-stage3/src/test/compile-fail/issue-3668.rs

@@ -1,12 +1,11 @@
-// xfail-test
 struct P { child: Option<@mut P> }
 trait PTrait {
    fn getChildOption() -> Option<@P>;
 }
 
 impl P: PTrait {
    fn getChildOption() -> Option<@P> {
-       const childVal: @P = self.child.get();
+       const childVal: @P = self.child.get(); //~ ERROR attempt to use a non-constant value in a constant
        fail;
    }
 }