language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Make known paths use core instead of std

Browse source
This commit is contained in:
Jonas Schievink 2020-06-11 16:22:31 +02:00
parent 32157d48f4
commit 90331ea035
7 changed files with 52 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/ra_ide/src/diagnostics.rs
View file

@ -321,7 +321,7 @@ mod tests {
fn test_wrap_return_type() {
let before = r#"
//- /main.rs
use std::{string::String, result::Result::{self, Ok, Err}};
use core::{string::String, result::Result::{self, Ok, Err}};
fn div(x: i32, y: i32) -> Result<i32, String> {
if y == 0 {
@ -330,7 +330,7 @@ mod tests {
x / y<|>
}
//- /std/lib.rs
//- /core/lib.rs
pub mod string {
pub struct String { }
}
@ -339,7 +339,7 @@ mod tests {
}
"#;
let after = r#"
use std::{string::String, result::Result::{self, Ok, Err}};
use core::{string::String, result::Result::{self, Ok, Err}};
fn div(x: i32, y: i32) -> Result<i32, String> {
if y == 0 {
@ -355,7 +355,7 @@ mod tests {
fn test_wrap_return_type_handles_generic_functions() {
let before = r#"
//- /main.rs
use std::result::Result::{self, Ok, Err};
use core::result::Result::{self, Ok, Err};
fn div<T>(x: T) -> Result<T, i32> {
if x == 0 {
@ -364,13 +364,13 @@ mod tests {
<|>x
}
//- /std/lib.rs
//- /core/lib.rs
pub mod result {
pub enum Result<T, E> { Ok(T), Err(E) }
}
"#;
let after = r#"
use std::result::Result::{self, Ok, Err};
use core::result::Result::{self, Ok, Err};
fn div<T>(x: T) -> Result<T, i32> {
if x == 0 {
@ -386,7 +386,7 @@ mod tests {
fn test_wrap_return_type_handles_type_aliases() {
let before = r#"
//- /main.rs
use std::{string::String, result::Result::{self, Ok, Err}};
use core::{string::String, result::Result::{self, Ok, Err}};
type MyResult<T> = Result<T, String>;
@ -397,7 +397,7 @@ mod tests {
x <|>/ y
}
//- /std/lib.rs
//- /core/lib.rs
pub mod string {
pub struct String { }
}
@ -406,7 +406,7 @@ mod tests {
}
"#;
let after = r#"
use std::{string::String, result::Result::{self, Ok, Err}};
use core::{string::String, result::Result::{self, Ok, Err}};
type MyResult<T> = Result<T, String>;
fn div(x: i32, y: i32) -> MyResult<i32> {