diff options
| author | Stephen Hines <srhines@google.com> | 2012-02-14 16:29:04 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-14 16:29:04 -0800 |
| commit | a4b64d27c858391bc046872a717887844f9f2af8 (patch) | |
| tree | 5b35f99b2aec8b8e5a0221b44165a31ec752eae6 /tests | |
| parent | 834517fd108265c17bdba1de6d2ef6d3634c852f (diff) | |
| parent | 9999ec3aa0c4d7a6befd3a300dc07f0cea91cb6c (diff) | |
| download | slang-a4b64d27c858391bc046872a717887844f9f2af8.tar.gz | |
Merge "Clean up graphics/compute root() distinction."
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/F_multi_export_errors/stderr.txt.expect | 2 | ||||
| -rw-r--r-- | tests/F_root_graphics/stderr.txt.expect | 2 | ||||
| -rw-r--r-- | tests/F_root_graphics_13/stderr.txt.expect | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/tests/F_multi_export_errors/stderr.txt.expect b/tests/F_multi_export_errors/stderr.txt.expect index f982c30..a39a137 100644 --- a/tests/F_multi_export_errors/stderr.txt.expect +++ b/tests/F_multi_export_errors/stderr.txt.expect @@ -1,3 +1,3 @@ multi_export_errors.rs:4:5: error: init(void) is required to have a void return type -multi_export_errors.rs:8:6: error: root(void) is required to return an int for graphics usage +multi_export_errors.rs:8:6: error: root() is required to return an int for graphics usage multi_export_errors.rs:11:5: error: invokable non-static functions are required to return void diff --git a/tests/F_root_graphics/stderr.txt.expect b/tests/F_root_graphics/stderr.txt.expect index cf56bad..6b1e04d 100644 --- a/tests/F_root_graphics/stderr.txt.expect +++ b/tests/F_root_graphics/stderr.txt.expect @@ -1 +1 @@ -root_graphics.rs:4:6: error: root(void) is required to return an int for graphics usage +root_graphics.rs:4:6: error: root() is required to return an int for graphics usage diff --git a/tests/F_root_graphics_13/stderr.txt.expect b/tests/F_root_graphics_13/stderr.txt.expect index 5670930..74e9ee0 100644 --- a/tests/F_root_graphics_13/stderr.txt.expect +++ b/tests/F_root_graphics_13/stderr.txt.expect @@ -1,3 +1 @@ -root_graphics_13.rs:5:5: error: compute root() is required to return a void type -root_graphics_13.rs:5:5: error: Compute root() must have at least one parameter for in or out -root_graphics_13.rs:5:5: error: Compute root() targeting SDK levels 11-13 may not skip parameters +root_graphics_13.rs:5:23: error: invalid parameter type for legacy graphics root() function: 'unsigned int' |