itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update wrap return tests

Browse Source 
Update "no diagnostic" tests, use `()` instead of `String`
This commit is contained in:
Jonas Schievink 2020-06-11 17:28:32 +02:00
parent 90331ea035
commit 215e229dd1
1 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
crates/ra_ide/src/diagnostics.rs
View File

@ -321,29 +321,26 @@ mod tests {
fn test_wrap_return_type() { fn test_wrap_return_type() {
let before = r#" let before = r#"
//- /main.rs //- /main.rs
use core::{string::String, result::Result::{self, Ok, Err}}; use core::result::Result::{self, Ok, Err};
fn div(x: i32, y: i32) -> Result<i32, String> { fn div(x: i32, y: i32) -> Result<i32, ()> {
if y == 0 { if y == 0 {
return Err("div by zero".into()); return Err(());
} }
x / y<|> x / y<|>
} }
//- /core/lib.rs //- /core/lib.rs
pub mod string {
pub struct String { }
}
pub mod result { pub mod result {
pub enum Result<T, E> { Ok(T), Err(E) } pub enum Result<T, E> { Ok(T), Err(E) }
} }
"#; "#;
let after = r#" let after = r#"
use core::{string::String, result::Result::{self, Ok, Err}}; use core::result::Result::{self, Ok, Err};
fn div(x: i32, y: i32) -> Result<i32, String> { fn div(x: i32, y: i32) -> Result<i32, ()> {
if y == 0 { if y == 0 {
return Err("div by zero".into()); return Err(());
} }
Ok(x / y) Ok(x / y)
} }
@ -386,32 +383,29 @@ mod tests {
fn test_wrap_return_type_handles_type_aliases() { fn test_wrap_return_type_handles_type_aliases() {
let before = r#" let before = r#"
//- /main.rs //- /main.rs
use core::{string::String, result::Result::{self, Ok, Err}}; use core::result::Result::{self, Ok, Err};
type MyResult<T> = Result<T, String>; type MyResult<T> = Result<T, ()>;
fn div(x: i32, y: i32) -> MyResult<i32> { fn div(x: i32, y: i32) -> MyResult<i32> {
if y == 0 { if y == 0 {
return Err("div by zero".into()); return Err(());
} }
x <|>/ y x <|>/ y
} }
//- /core/lib.rs //- /core/lib.rs
pub mod string {
pub struct String { }
}
pub mod result { pub mod result {
pub enum Result<T, E> { Ok(T), Err(E) } pub enum Result<T, E> { Ok(T), Err(E) }
} }
"#; "#;
let after = r#" let after = r#"
use core::{string::String, result::Result::{self, Ok, Err}}; use core::result::Result::{self, Ok, Err};
type MyResult<T> = Result<T, String>; type MyResult<T> = Result<T, ()>;
fn div(x: i32, y: i32) -> MyResult<i32> { fn div(x: i32, y: i32) -> MyResult<i32> {
if y == 0 { if y == 0 {
return Err("div by zero".into()); return Err(());
} }
Ok(x / y) Ok(x / y)
} }
@ -423,16 +417,13 @@ mod tests {
fn test_wrap_return_type_not_applicable_when_expr_type_does_not_match_ok_type() { fn test_wrap_return_type_not_applicable_when_expr_type_does_not_match_ok_type() {
let content = r#" let content = r#"
//- /main.rs //- /main.rs
use std::{string::String, result::Result::{self, Ok, Err}}; use core::result::Result::{self, Ok, Err};
fn foo() -> Result<String, i32> { fn foo() -> Result<(), i32> {
0<|> 0<|>
} }
//- /std/lib.rs //- /core/lib.rs
pub mod string {
pub struct String { }
}
pub mod result { pub mod result {
pub enum Result<T, E> { Ok(T), Err(E) } pub enum Result<T, E> { Ok(T), Err(E) }
} }
@ -444,7 +435,7 @@ mod tests {
fn test_wrap_return_type_not_applicable_when_return_type_is_not_result() { fn test_wrap_return_type_not_applicable_when_return_type_is_not_result() {
let content = r#" let content = r#"
//- /main.rs //- /main.rs
use std::{string::String, result::Result::{self, Ok, Err}}; use core::result::Result::{self, Ok, Err};
enum SomeOtherEnum { enum SomeOtherEnum {
Ok(i32), Ok(i32),
@ -455,10 +446,7 @@ mod tests {
0<|> 0<|>
} }
//- /std/lib.rs //- /core/lib.rs
pub mod string {
pub struct String { }
}
pub mod result { pub mod result {
pub enum Result<T, E> { Ok(T), Err(E) } pub enum Result<T, E> { Ok(T), Err(E) }
} }