Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
3a6a29b
Use associated_type_bounds where applicable - closes #61738
iluuu1994 Jul 31, 2019
322a7d6
Add test for issue 36804
jackh726 Aug 8, 2019
3d231ac
Add missing #![feature(associated_type_bounds)]
iluuu1994 Aug 8, 2019
77bfd7f
Don't use associated type bounds in docs until it is stable
iluuu1994 Aug 9, 2019
c076392
Tweak mismatched types error on break expressions
estebank Aug 6, 2019
799b13a
Do not suggest using ! with break
estebank Aug 7, 2019
4fbbf99
Be more accurate when mentioning type of found match arms
estebank Aug 7, 2019
01a6139
Change wording for function without return value
estebank Aug 7, 2019
94fe8a3
Suggest calling function on type error when finding bare fn
estebank Aug 7, 2019
195d837
When suggesting fn call use an appropriate number of placeholder argu…
estebank Aug 8, 2019
b7f7756
Recover parser from `foo(_, _)`
estebank Aug 8, 2019
0d53f69
review comments
estebank Aug 8, 2019
efa62d6
Tweak wording of fn without explicit return
estebank Aug 8, 2019
52da091
Differentiate between tuple structs and tuple variants
estebank Aug 8, 2019
5a54945
Extend suggestion support for traits and foreign items
estebank Aug 8, 2019
33d1082
review comment: review wording or missing return error
estebank Aug 8, 2019
bc1a4f5
review comments: typo and rewording
estebank Aug 8, 2019
45a5bc7
fix tests
estebank Aug 9, 2019
7c96d90
More explicit diagnostic when using a `vec![]` in a pattern
estebank Aug 9, 2019
75c5ad2
review comments: use structured suggestion
estebank Aug 9, 2019
4dd96d2
check against more collisions for TypeId of fn pointer
RalfJung Aug 9, 2019
b9865d9
Mention that tuple structs are private if their fields are
estebank Aug 9, 2019
cbcc7dd
Give built-in macros stable addresses in the standard library
petrochenkov Jul 27, 2019
0ef7c28
resolve: Populate external modules in more automatic and lazy way
petrochenkov Jul 29, 2019
3ee614b
resolve: Populate external traits lazily as well
petrochenkov Jul 30, 2019
2cb9207
resolve: Move some code around
petrochenkov Jul 30, 2019
a38cbcf
Rollup merge of #63056 - petrochenkov:macstd2, r=alexcrichton
Centril Aug 10, 2019
a14318d
Rollup merge of #63149 - petrochenkov:lazypop2, r=eddyb
Centril Aug 10, 2019
5379a7d
Rollup merge of #63337 - estebank:break-ee0308, r=Centril
Centril Aug 10, 2019
a29196d
Rollup merge of #63350 - iluuu1994:use-associated-type-bounds, r=Centril
Centril Aug 10, 2019
45d089a
Rollup merge of #63394 - jackh726:issue-36804, r=jonas-schievink
Centril Aug 10, 2019
9ece794
Rollup merge of #63399 - estebank:vec-in-pat, r=Centril
Centril Aug 10, 2019
664b34d
Rollup merge of #63419 - RalfJung:typeid, r=alexcrichton
Centril Aug 10, 2019
2dfa3a9
Rollup merge of #63423 - estebank:priv-tuple, r=zackmdavis
Centril Aug 10, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
review comment: review wording or missing return error
  • Loading branch information
estebank committed Aug 9, 2019
commit 33d1082d6e3cb9fe5e0fd090f52a3effa9871fce
3 changes: 2 additions & 1 deletion src/librustc_typeck/check/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3711,7 +3711,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
if let Some(fn_span) = fn_span {
err.span_label(
fn_span,
"this function's body doesn't `return` a value",
"this function implicitly returns `()` as its body has no tail \
or `return` expression",
);
}
}, false);
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/block-result/consider-removing-last-semi.stderr
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
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
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
...
LL | ;
| - help: consider removing this semicolon
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/block-result/issue-13428.stderr
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
...
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
LL | "foobar".to_string()
LL | ;
| - help: consider removing this semicolon
Expand Down
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
LL | Ok(1);
| - help: consider removing this semicolon
|
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/issues/issue-32323.stderr
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
|
= 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
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
LL |
LL | break true;
| - help: consider removing this semicolon
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/issues/issue-44023.stderr
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
|
= note: expected type `isize`
found type `()`
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/issues/issue-6458-4.stderr
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
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
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
|
= note: expected type `isize`
found type `()`
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/liveness/liveness-missing-ret2.stderr
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
|
= note: expected type `isize`
found type `()`
Expand Down
8 changes: 4 additions & 4 deletions src/test/ui/liveness/liveness-return-last-stmt-semi.stderr
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
...
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
|
= 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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
|
= note: expected type `u32`
found type `()`
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/missing/missing-return.stderr
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
|
= note: expected type `isize`
found type `()`
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/parser/issue-62881.stderr
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
|
= note: expected type `isize`
found type `()`
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/parser/issue-62895.stderr
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` a value
| this function implicitly returns `()` as its body has no tail or `return` expression
|
= note: expected type `isize`
found type `()`
Expand Down