diff options
| author | kennytm <kennytm@gmail.com> | 2018-03-16 01:49:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-16 01:49:38 +0800 |
| commit | a45b79ddb7e8d65c12d5b8f2e46ac22698bd134e (patch) | |
| tree | ad28c105929e8eaa25c72ce7cf55feb4f228d9fd /src/test/ui/generator | |
| parent | ff2d506c2c748bd218f74c6014abc4cecc8c74c4 (diff) | |
| parent | 525727529492f30ef9d68467d5b8a7f18f65d743 (diff) | |
Rollup merge of #48706 - ehuss:main-not-found-in-crate, r=estebank
Add crate name to "main function not found" error message.
Fixes #44798 and rust-lang/cargo#4948.
I was wondering if it might be cleaner to update the ui tests to add a simple `fn main() {}` for the unrelated tests. Let me know if you would prefer that.
Diffstat (limited to 'src/test/ui/generator')
| -rw-r--r-- | src/test/ui/generator/yield-in-const.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/generator/yield-in-const.stderr | 7 | ||||
| -rw-r--r-- | src/test/ui/generator/yield-in-static.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/generator/yield-in-static.stderr | 7 |
4 files changed, 8 insertions, 10 deletions
diff --git a/src/test/ui/generator/yield-in-const.rs b/src/test/ui/generator/yield-in-const.rs index e166d265159..8636a66ae00 100644 --- a/src/test/ui/generator/yield-in-const.rs +++ b/src/test/ui/generator/yield-in-const.rs @@ -12,3 +12,5 @@ const A: u8 = { yield 3u8; 3u8}; //~^ ERROR yield statement outside + +fn main() {} diff --git a/src/test/ui/generator/yield-in-const.stderr b/src/test/ui/generator/yield-in-const.stderr index 41a20893f5c..874edce5931 100644 --- a/src/test/ui/generator/yield-in-const.stderr +++ b/src/test/ui/generator/yield-in-const.stderr @@ -1,12 +1,9 @@ -error[E0601]: main function not found - error[E0627]: yield statement outside of generator literal --> $DIR/yield-in-const.rs:13:17 | LL | const A: u8 = { yield 3u8; 3u8}; | ^^^^^^^^^ -error: aborting due to 2 previous errors +error: aborting due to previous error -Some errors occurred: E0601, E0627. -For more information about an error, try `rustc --explain E0601`. +For more information about this error, try `rustc --explain E0627`. diff --git a/src/test/ui/generator/yield-in-static.rs b/src/test/ui/generator/yield-in-static.rs index 823a2aa425e..21601f47f67 100644 --- a/src/test/ui/generator/yield-in-static.rs +++ b/src/test/ui/generator/yield-in-static.rs @@ -12,3 +12,5 @@ static B: u8 = { yield 3u8; 3u8}; //~^ ERROR yield statement outside + +fn main() {} diff --git a/src/test/ui/generator/yield-in-static.stderr b/src/test/ui/generator/yield-in-static.stderr index 71ebc189035..35d1ebaabdc 100644 --- a/src/test/ui/generator/yield-in-static.stderr +++ b/src/test/ui/generator/yield-in-static.stderr @@ -1,12 +1,9 @@ -error[E0601]: main function not found - error[E0627]: yield statement outside of generator literal --> $DIR/yield-in-static.rs:13:18 | LL | static B: u8 = { yield 3u8; 3u8}; | ^^^^^^^^^ -error: aborting due to 2 previous errors +error: aborting due to previous error -Some errors occurred: E0601, E0627. -For more information about an error, try `rustc --explain E0601`. +For more information about this error, try `rustc --explain E0627`. |