summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-05-14 19:33:10 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-05-14 19:33:10 +0530
commit1109b6dd8d796924e40577e608d1f34d8b91d8ed (patch)
treec79f5f286faee8e3bfa191ddbb56de3c3727e4ad /src/test
parentff207b7a0526a0ad08a4eef58e47447671eeefcd (diff)
parent588777f5471db2d03b5a376efbc21c1dc10fc364 (diff)
downloadrust-1109b6dd8d796924e40577e608d1f34d8b91d8ed.tar.gz
rust-1109b6dd8d796924e40577e608d1f34d8b91d8ed.zip
Rollup merge of #25398 - nham:E0066_E0069, r=huonw
Adds explanations for E0053, E0066, E0069, E0251, E0252, E0255, E0256, E0368.

cc #24407 
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/issue-14084.rs2
-rw-r--r--src/test/compile-fail/ret-non-nil.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/compile-fail/issue-14084.rs b/src/test/compile-fail/issue-14084.rs
index 92e0dd3ad0e..003c6644f7f 100644
--- a/src/test/compile-fail/issue-14084.rs
+++ b/src/test/compile-fail/issue-14084.rs
@@ -12,5 +12,5 @@
 
 fn main() {
     box ( () ) 0;
-    //~^ ERROR: only the managed heap and exchange heap are currently supported
+    //~^ ERROR: only the exchange heap is currently supported
 }
diff --git a/src/test/compile-fail/ret-non-nil.rs b/src/test/compile-fail/ret-non-nil.rs
index 4ee3cf4abac..6be98fbd827 100644
--- a/src/test/compile-fail/ret-non-nil.rs
+++ b/src/test/compile-fail/ret-non-nil.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: `return;` in function returning non-nil
+// error-pattern: `return;` in a function whose return type is not `()`
 
 fn f() { return; }