nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #3846 - mikerite:fix-3839, r=phansch

Browse Source 
Ensure `expect_fun_call` bad suggestion is fixed

Closes #3839
This commit is contained in:
bors 2019-03-06 05:54:48 +00:00
commit 400ee06789
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/ui/expect_fun_call.fixed
View File

@ -81,4 +81,7 @@ fn main() {
Some("foo").unwrap_or_else(|| { panic!(get_static_str()) }); Some("foo").unwrap_or_else(|| { panic!(get_static_str()) });
Some("foo").unwrap_or_else(|| { panic!(get_non_static_str(&0).to_string()) }); Some("foo").unwrap_or_else(|| { panic!(get_non_static_str(&0).to_string()) });
} }
//Issue #3839
Some(true).unwrap_or_else(|| panic!("key {}, {}", 1, 2));
} }

3
tests/ui/expect_fun_call.rs
View File

@ -81,4 +81,7 @@ fn main() {
Some("foo").expect(get_static_str()); Some("foo").expect(get_static_str());
Some("foo").expect(get_non_static_str(&0)); Some("foo").expect(get_non_static_str(&0));
} }
//Issue #3839
Some(true).expect(&format!("key {}, {}", 1, 2));
} }

8
tests/ui/expect_fun_call.stderr
View File

@ -60,5 +60,11 @@ error: use of `expect` followed by a function call
LL | Some("foo").expect(get_non_static_str(&0)); LL | Some("foo").expect(get_non_static_str(&0));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|| { panic!(get_non_static_str(&0).to_string()) })` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|| { panic!(get_non_static_str(&0).to_string()) })`
error: aborting due to 10 previous errors error: use of `expect` followed by a function call
--> $DIR/expect_fun_call.rs:86:16
|
LL | Some(true).expect(&format!("key {}, {}", 1, 2));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|| panic!("key {}, {}", 1, 2))`
error: aborting due to 11 previous errors