user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix or_fun_call bad suggestion

Browse source 
Closes #4514
This commit is contained in:
Michael Wright 2019-09-08 11:03:45 +02:00
parent f30bf69ec7
commit 9bdfd0683f
3 changed files with 54 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/ui/or_fun_call.fixed
View file

@ -99,4 +99,16 @@ fn test_or_with_ctors() {
.or(Some(Bar(b, Duration::from_secs(2))));
}
// Issue 4514 - early return
fn f() -> Option<()> {
let a = Some(1);
let b = 1i32;
let _ = a.unwrap_or(b.checked_mul(3)?.min(240));
Some(())
}
fn main() {}

12
tests/ui/or_fun_call.rs
View file

@ -99,4 +99,16 @@ fn test_or_with_ctors() {
.or(Some(Bar(b, Duration::from_secs(2))));
}
// Issue 4514 - early return
fn f() -> Option<()> {
let a = Some(1);
let b = 1i32;
let _ = a.unwrap_or(b.checked_mul(3)?.min(240));
Some(())
}
fn main() {}