diff options
| author | bors <bors@rust-lang.org> | 2015-05-14 20:03:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-14 20:03:39 +0000 |
| commit | 571f371b3fce3e023fb1b41a1682de260c943222 (patch) | |
| tree | 6db38ec1db5609f61379667b1ba406bca992e826 /src/test | |
| parent | dd4dad8c860363077a3d53af025a0c029a613320 (diff) | |
| parent | 2df7ae6e647c1dff50c9bf21e8883827096f48c1 (diff) | |
| download | rust-571f371b3fce3e023fb1b41a1682de260c943222.tar.gz rust-571f371b3fce3e023fb1b41a1682de260c943222.zip | |
Auto merge of #25403 - Manishearth:rollup, r=Manishearth
- Successful merges: #25354, #25381, #25391, #25395, #25397, #25398, #25401 - Failed merges:
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/compile-fail/issue-14084.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/ret-non-nil.rs | 2 |
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; } |