Skip to content

Commit

Permalink
Change wording for function without return value
Browse files Browse the repository at this point in the history 
Fix rust-lang#62677
  • Loading branch information
@estebank
estebank committed Aug 9, 2019
1 parent 4fbbf99 commit 01a6139
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/librustc_typeck/check/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3709,7 +3709,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
self.consider_hint_about_removing_semicolon(blk, expected_ty, err);
}
if let Some(fn_span) = fn_span {
err.span_label(fn_span, "this function's body doesn't return");
err.span_label(fn_span, "this function's body doesn't return a value");
}
}, false);
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/block-result/consider-removing-last-semi.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error[E0308]: mismatched types
LL | fn f() -> String {
| - ^^^^^^ expected struct `std::string::String`, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
LL | 0u8;
LL | "bla".to_string();
| - help: consider removing this semicolon
Expand All @@ -18,7 +18,7 @@ error[E0308]: mismatched types
LL | fn g() -> String {
| - ^^^^^^ expected struct `std::string::String`, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
LL | "this won't work".to_string();
LL | "removeme".to_string();
| - help: consider removing this semicolon
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/block-result/issue-11714.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error[E0308]: mismatched types
LL | fn blah() -> i32 {
| ---- ^^^ expected i32, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
...
LL | ;
| - help: consider removing this semicolon
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/block-result/issue-13428.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error[E0308]: mismatched types
LL | fn foo() -> String {
| --- ^^^^^^ expected struct `std::string::String`, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
...
LL | ;
| - help: consider removing this semicolon
Expand All @@ -18,7 +18,7 @@ error[E0308]: mismatched types
LL | fn bar() -> String {
| --- ^^^^^^ expected struct `std::string::String`, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
LL | "foobar".to_string()
LL | ;
| - help: consider removing this semicolon
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/coercion/coercion-missing-tail-expected-type.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error[E0308]: mismatched types
LL | fn plus_one(x: i32) -> i32 {
| -------- ^^^ expected i32, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
LL | x + 1;
| - help: consider removing this semicolon
|
Expand All @@ -17,7 +17,7 @@ error[E0308]: mismatched types
LL | fn foo() -> Result<u8, u64> {
| --- ^^^^^^^^^^^^^^^ expected enum `std::result::Result`, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
LL | Ok(1);
| - help: consider removing this semicolon
|
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/issues/issue-32323.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error[E0308]: mismatched types
LL | pub fn f<'a, T: Tr<'a>>() -> <T as Tr<'a>>::Out {}
| - ^^^^^^^^^^^^^^^^^^ expected associated type, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
|
= note: expected type `<T as Tr<'a>>::Out`
found type `()`
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/issues/issue-43162.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ error[E0308]: mismatched types
LL | fn foo() -> bool {
| --- ^^^^ expected bool, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
LL |
LL | break true;
| - help: consider removing this semicolon
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/issues/issue-44023.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error[E0308]: mismatched types
LL | fn საჭმელად_გემრიელი_სადილი ( ) -> isize {
| ------------------------ ^^^^^ expected isize, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
|
= note: expected type `isize`
found type `()`
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/issues/issue-6458-4.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error[E0308]: mismatched types
LL | fn foo(b: bool) -> Result<bool,String> {
| --- ^^^^^^^^^^^^^^^^^^^ expected enum `std::result::Result`, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
LL | Err("bar".to_string());
| - help: consider removing this semicolon
|
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/liveness/liveness-forgot-ret.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error[E0308]: mismatched types
LL | fn f(a: isize) -> isize { if god_exists(a) { return 5; }; }
| - ^^^^^ expected isize, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
|
= note: expected type `isize`
found type `()`
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/liveness/liveness-missing-ret2.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error[E0308]: mismatched types
LL | fn f() -> isize {
| - ^^^^^ expected isize, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
|
= note: expected type `isize`
found type `()`
Expand Down
8 changes: 4 additions & 4 deletions src/test/ui/liveness/liveness-return-last-stmt-semi.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LL | macro_rules! test { () => { fn foo() -> i32 { 1; } } }
| --- ^^^ - help: consider removing this semicolon
| | |
| | expected i32, found ()
| this function's body doesn't return
| this function's body doesn't return a value
...
LL | test!();
| -------- in this macro invocation
Expand All @@ -19,7 +19,7 @@ error[E0308]: mismatched types
LL | fn no_return() -> i32 {}
| --------- ^^^ expected i32, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
|
= note: expected type `i32`
found type `()`
Expand All @@ -30,7 +30,7 @@ error[E0308]: mismatched types
LL | fn bar(x: u32) -> u32 {
| --- ^^^ expected u32, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
LL | x * 2;
| - help: consider removing this semicolon
|
Expand All @@ -43,7 +43,7 @@ error[E0308]: mismatched types
LL | fn baz(x: u64) -> u32 {
| --- ^^^ expected u32, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
|
= note: expected type `u32`
found type `()`
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/missing/missing-return.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error[E0308]: mismatched types
LL | fn f() -> isize { }
| - ^^^^^ expected isize, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
|
= note: expected type `isize`
found type `()`
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/parser/issue-62881.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ error[E0308]: mismatched types
LL | fn f() -> isize { fn f() -> isize {} pub f<
| - ^^^^^ expected isize, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
|
= note: expected type `isize`
found type `()`
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/parser/issue-62895.stderr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ error[E0308]: mismatched types
LL | fn v() -> isize {
| - ^^^^^ expected isize, found ()
| |
| this function's body doesn't return
| this function's body doesn't return a value
|
= note: expected type `isize`
found type `()`
Expand Down

0 comments on commit 01a6139

Please sign in to comment.