summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorNick Hamann <nick@wabbo.org>2015-05-11 23:36:54 -0500
committerNick Hamann <nick@wabbo.org>2015-05-13 19:55:34 -0500
commita4444aa78079665658b0d656c6d243d88a9ac5cc (patch)
tree98886f8ed6501d5fb3b561674d1b85d17cde95aa /src/test
parent5a341ecfc985c190d8c359a8c995a094ef22ab9e (diff)
downloadrust-a4444aa78079665658b0d656c6d243d88a9ac5cc.tar.gz
rust-a4444aa78079665658b0d656c6d243d88a9ac5cc.zip
Add error explanations for E0066 and E0069.
This also updates the error messages for both. For E0066, it removes mention
of "managed heap", which was removed in 8a91d33. For E0069, I just tweaked
the wording to make it a bit more explicit.
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; }