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

Merge #3953

Browse Source 
3953: Remove #[should_panic] from call_info tests r=matklad a=kjeremy

Better fix than #3952

Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
This commit is contained in:
bors[bot] 2020-04-11 20:58:59 +00:00 committed by GitHub
commit f13da3f895
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/ra_ide/src/call_info.rs
View File

@ -208,9 +208,20 @@ mod tests {
} }
} }
fn call_info(text: &str) -> CallInfo { fn call_info_helper(text: &str) -> Option<CallInfo> {
let (analysis, position) = single_file_with_position(text); let (analysis, position) = single_file_with_position(text);
analysis.call_info(position).unwrap().unwrap() analysis.call_info(position).unwrap()
}
fn call_info(text: &str) -> CallInfo {
let info = call_info_helper(text);
assert!(info.is_some());
info.unwrap()
}
fn no_call_info(text: &str) {
let info = call_info_helper(text);
assert!(info.is_none());
} }
#[test] #[test]
@ -558,9 +569,8 @@ fn main() {
} }
#[test] #[test]
#[should_panic]
fn cant_call_named_structs() { fn cant_call_named_structs() {
let _ = call_info( no_call_info(
r#" r#"
struct TS { x: u32, y: i32 } struct TS { x: u32, y: i32 }
fn main() { fn main() {
@ -594,9 +604,8 @@ fn main() {
} }
#[test] #[test]
#[should_panic]
fn cant_call_enum_records() { fn cant_call_enum_records() {
let _ = call_info( no_call_info(
r#" r#"
enum E { enum E {
/// A Variant /// A Variant