---

yaml
---
r: 38620
b: refs/heads/incoming
c: c5b82a6
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 4f9e7babeb3fce422072f51959470ecec4dead53
+refs/heads/incoming: c5b82a65e96cfe77e4983e78a34a7d5aa91329b4
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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/incoming/src/test/run-pass/issue-3668.rs renamed to branches/incoming/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;
    }
 }