about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/test/compile-fail/issue-3668-2.rs5
-rw-r--r--src/test/compile-fail/issue-3668.rs (renamed from src/test/run-pass/issue-3668.rs)3
-rw-r--r--src/test/run-pass/issue-3688-2.rs6
3 files changed, 6 insertions, 8 deletions
diff --git a/src/test/compile-fail/issue-3668-2.rs b/src/test/compile-fail/issue-3668-2.rs
new file mode 100644
index 00000000000..89c9e2b2e91
--- /dev/null
+++ b/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() {}
diff --git a/src/test/run-pass/issue-3668.rs b/src/test/compile-fail/issue-3668.rs
index 8b3005a3589..6cbd64c6aa9 100644
--- a/src/test/run-pass/issue-3668.rs
+++ b/src/test/compile-fail/issue-3668.rs
@@ -1,4 +1,3 @@
-// xfail-test
 struct P { child: Option<@mut P> }
 trait PTrait {
    fn getChildOption() -> Option<@P>;
@@ -6,7 +5,7 @@ trait PTrait {
 
 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;
    }
 }
diff --git a/src/test/run-pass/issue-3688-2.rs b/src/test/run-pass/issue-3688-2.rs
deleted file mode 100644
index 8a5b0e26829..00000000000
--- a/src/test/run-pass/issue-3688-2.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// xfail-test
-fn f(x:int) {
-    const child: int = x + 1;
-}
-
-fn main() {}