Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 06:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix tests

Browse source
This commit is contained in:
hkalbasi 2023-01-16 23:45:12 +03:30
parent 77efa0267d
commit ec65b3b3aa
2 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/base-db/src/fixture.rs
View file

@ -110,6 +110,7 @@ impl ChangeFixture {
let mut crates = FxHashMap::default(); let mut crates = FxHashMap::default();
let mut crate_deps = Vec::new(); let mut crate_deps = Vec::new();
let mut default_crate_root: Option<FileId> = None; let mut default_crate_root: Option<FileId> = None;
let mut default_target_data_layout: Option<String> = None;
let mut default_cfg = CfgOptions::default(); let mut default_cfg = CfgOptions::default();
let mut file_set = FileSet::default(); let mut file_set = FileSet::default();
@ -175,6 +176,7 @@ impl ChangeFixture {
assert!(default_crate_root.is_none()); assert!(default_crate_root.is_none());
default_crate_root = Some(file_id); default_crate_root = Some(file_id);
default_cfg = meta.cfg; default_cfg = meta.cfg;
default_target_data_layout = meta.target_data_layout;
} }
change.change_file(file_id, Some(Arc::new(text))); change.change_file(file_id, Some(Arc::new(text)));
@ -198,7 +200,7 @@ impl ChangeFixture {
Ok(Vec::new()), Ok(Vec::new()),
false, false,
CrateOrigin::CratesIo { repo: None, name: None }, CrateOrigin::CratesIo { repo: None, name: None },
None, default_target_data_layout.map(|x| x.into()),
); );
} else { } else {
for (from, to, prelude) in crate_deps { for (from, to, prelude) in crate_deps {

24
crates/ide/src/hover/tests.rs
View file

@ -527,6 +527,7 @@ fn hover_field_offset() {
// Hovering over the field when instantiating // Hovering over the field when instantiating
check( check(
r#" r#"
//- /main.rs target_data_layout:e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128
struct Foo { fiel$0d_a: u8, field_b: i32, field_c: i16 } struct Foo { fiel$0d_a: u8, field_b: i32, field_c: i16 }
"#, "#,
expect![[r#" expect![[r#"
@ -548,6 +549,7 @@ fn hover_shows_struct_field_info() {
// Hovering over the field when instantiating // Hovering over the field when instantiating
check( check(
r#" r#"
//- /main.rs target_data_layout:e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128
struct Foo { field_a: u32 } struct Foo { field_a: u32 }
fn main() { fn main() {
@ -570,6 +572,7 @@ fn main() {
// Hovering over the field in the definition // Hovering over the field in the definition
check( check(
r#" r#"
//- /main.rs target_data_layout:e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128
struct Foo { field_a$0: u32 } struct Foo { field_a$0: u32 }
fn main() { fn main() {
@ -1515,6 +1518,8 @@ fn my() {}
fn test_hover_struct_doc_comment() { fn test_hover_struct_doc_comment() {
check( check(
r#" r#"
//- /main.rs target_data_layout:e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128
/// This is an example /// This is an example
/// multiline doc /// multiline doc
/// ///
@ -1573,7 +1578,7 @@ fn foo() { let bar = Ba$0r; }
``` ```
```rust ```rust
struct Bar // size = 0, align = 1 struct Bar
``` ```
--- ---
@ -1602,7 +1607,7 @@ fn foo() { let bar = Ba$0r; }
``` ```
```rust ```rust
struct Bar // size = 0, align = 1 struct Bar
``` ```
--- ---
@ -1630,7 +1635,7 @@ pub struct B$0ar
``` ```
```rust ```rust
pub struct Bar // size = 0, align = 1 pub struct Bar
``` ```
--- ---
@ -1657,7 +1662,7 @@ pub struct B$0ar
``` ```
```rust ```rust
pub struct Bar // size = 0, align = 1 pub struct Bar
``` ```
--- ---
@ -2959,6 +2964,8 @@ fn main() { let foo_test = name_with_dashes::wrapper::Thing::new$0(); }
fn hover_field_pat_shorthand_ref_match_ergonomics() { fn hover_field_pat_shorthand_ref_match_ergonomics() {
check( check(
r#" r#"
//- /main.rs target_data_layout:e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128
struct S { struct S {
f: i32, f: i32,
} }
@ -4398,6 +4405,7 @@ fn main() {
fn hover_intra_doc_links() { fn hover_intra_doc_links() {
check( check(
r#" r#"
//- /main.rs target_data_layout:e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128
pub mod theitem { pub mod theitem {
/// This is the item. Cool! /// This is the item. Cool!
@ -4539,7 +4547,7 @@ trait A where
fn string_shadowed_with_inner_items() { fn string_shadowed_with_inner_items() {
check( check(
r#" r#"
//- /main.rs crate:main deps:alloc //- /main.rs crate:main deps:alloc target_data_layout:e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128
/// Custom `String` type. /// Custom `String` type.
struct String; struct String;
@ -5234,7 +5242,7 @@ foo_macro!(
``` ```
```rust ```rust
pub struct Foo // size = 0, align = 1 pub struct Foo
``` ```
--- ---
@ -5248,6 +5256,8 @@ foo_macro!(
fn hover_intra_in_attr() { fn hover_intra_in_attr() {
check( check(
r#" r#"
//- /main.rs target_data_layout:e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128
#[doc = "Doc comment for [`Foo$0`]"] #[doc = "Doc comment for [`Foo$0`]"]
pub struct Foo(i32); pub struct Foo(i32);
"#, "#,
@ -5368,6 +5378,8 @@ enum Enum {
fn hover_record_variant_field() { fn hover_record_variant_field() {
check( check(
r#" r#"
//- /main.rs target_data_layout:e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128
enum Enum { enum Enum {
RecordV { field$0: u32 } RecordV { field$0: u32 }
} }