NotificationsYou must be signed in to change notification settings
Fork14.1k
Star108k

Commitb1830a5

committed

Update assists test fixtures

1 parentb29c755 commitb1830a5Copy full SHA for b1830a5

File tree

6 files changed

+18

-29

lines changed

src/tools/rust-analyzer/crates
- hir/src/term_search
  - expr.rs
- ide-assists/src/handlers
- ide-db/src/imports
  - import_assets.rs
- ide-diagnostics/src/handlers
  - typed_hole.rs

6 files changed

+18

-29

lines changed

`‎src/tools/rust-analyzer/crates/hir/src/term_search/expr.rs‎`

Lines changed: 1 addition & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`//! Type tree for term search`
`2`	`2`
`3`		`-use hir_def::find_path::PrefixKind;`
`4`	`3`	`use hir_expand::mod_path::ModPath;`
`5`	`4`	`use hir_ty::{`
`6`	`5`	`db::HirDatabase,`
`@@ -21,23 +20,8 @@ fn mod_item_path(`
`21`	`20`	`prefer_prelude:bool,`
`22`	`21`	`) ->Option<ModPath>{`
`23`	`22`	`let db = sema_scope.db;`
`24`		`-// Account for locals shadowing items from module`
`25`		`-let name_hit_count = def.name(db).map(\|def_name\|{`
`26`		`-letmut name_hit_count =0;`
`27`		`- sema_scope.process_all_names(&mut \|name, _\|{`
`28`		`-if name == def_name{`
`29`		`- name_hit_count +=1;`
`30`		`-}`
`31`		`-});`
`32`		`- name_hit_count`
`33`		`-});`
`34`		`-`
`35`	`23`	`let m = sema_scope.module();`
`36`		`-let prefix =match name_hit_count{`
`37`		`-Some(0..=1) \|None =>PrefixKind::Plain,`
`38`		`-Some(_) =>PrefixKind::ByCrate,`
`39`		`-};`
`40`		`- m.find_use_path(db.upcast(),*def, prefix, prefer_no_std, prefer_prelude)`
	`24`	`+ m.find_path(db.upcast(),*def, prefer_no_std, prefer_prelude)`
`41`	`25`	`}`
`42`	`26`
`43`	`27`	/// Helper function to get path to `ModuleDef` as string

`‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/bool_to_enum.rs‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1521,7 +1521,7 @@ mod foo {`
`1521`	`1521`	`}`
`1522`	`1522`	`"#,`
`1523`	`1523`	`r#"`
`1524`		`-usecrate::foo::Bool;`
	`1524`	`+use foo::Bool;`
`1525`	`1525`
`1526`	`1526`	`fn main() {`
`1527`	`1527`	`use foo::FOO;`
`@@ -1602,7 +1602,7 @@ pub mod bar {`
`1602`	`1602`	`"#,`
`1603`	`1603`	`r#"`
`1604`	`1604`	`//- /main.rs`
`1605`		`-usecrate::foo::bar::Bool;`
	`1605`	`+use foo::bar::Bool;`
`1606`	`1606`
`1607`	`1607`	`mod foo;`
`1608`	`1608`

`‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/convert_tuple_return_type_to_struct.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -811,7 +811,7 @@ pub mod bar {`
`811`	`811`	`"#,`
`812`	`812`	`r#"`
`813`	`813`	`//- /main.rs`
`814`		`-usecrate::foo::bar::BarResult;`
	`814`	`+use foo::bar::BarResult;`
`815`	`815`
`816`	`816`	`mod foo;`
`817`	`817`

`‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -881,7 +881,7 @@ fn another_fn() {`
`881`	`881`	`r#"use my_mod::my_other_mod::MyField;`
`882`	`882`
`883`	`883`	`mod my_mod {`
`884`		`- useself::my_other_mod::MyField;`
	`884`	`+ use my_other_mod::MyField;`
`885`	`885`
`886`	`886`	`fn another_fn() {`
`887`	`887`	`let m = my_other_mod::MyEnum::MyField(MyField(1, 1));`

`‎src/tools/rust-analyzer/crates/ide-db/src/imports/import_assets.rs‎`

Lines changed: 11 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -637,13 +637,17 @@ fn get_mod_path(`
`637`	`637`	`prefer_no_std:bool,`
`638`	`638`	`prefer_prelude:bool,`
`639`	`639`	`) ->Option<ModPath>{`
`640`		`- module_with_candidate.find_use_path(`
`641`		`- db,`
`642`		`- item_to_search,`
`643`		`- prefixed.unwrap_or(PrefixKind::Plain),`
`644`		`- prefer_no_std,`
`645`		`- prefer_prelude,`
`646`		`-)`
	`640`	`+ifletSome(prefix_kind) = prefixed{`
	`641`	`+ module_with_candidate.find_use_path(`
	`642`	`+ db,`
	`643`	`+ item_to_search,`
	`644`	`+ prefix_kind,`
	`645`	`+ prefer_no_std,`
	`646`	`+ prefer_prelude,`
	`647`	`+)`
	`648`	`+}else{`
	`649`	`+ module_with_candidate.find_path(db, item_to_search, prefer_no_std, prefer_prelude)`
	`650`	`+}`
`647`	`651`	`}`
`648`	`652`
`649`	`653`	`implImportCandidate{`

`‎src/tools/rust-analyzer/crates/ide-diagnostics/src/handlers/typed_hole.rs‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -368,6 +368,7 @@ fn main() {`
`368`	`368`	`);`
`369`	`369`	`}`
`370`	`370`
	`371`	`+// FIXME`
`371`	`372`	`#[test]`
`372`	`373`	`fnlocal_shadow_fn(){`
`373`	`374`	`check_fixes_unordered(`
`@@ -385,7 +386,7 @@ fn f() {`
`385`	`386`	`r#"`
`386`	`387`	`fn f() {`
`387`	`388`	`let f: i32 = 0;`
`388`		`-crate::f()`
	`389`	`+ f()`
`389`	`390`	`}"#,`
`390`	`391`	`],`
`391`	`392`	`);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb1830a5

File tree

6 files changed

6 files changed

`‎src/tools/rust-analyzer/crates/hir/src/term_search/expr.rs‎`

`‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/bool_to_enum.rs‎`

`‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/convert_tuple_return_type_to_struct.rs‎`

`‎src/tools/rust-analyzer/crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs‎`

`‎src/tools/rust-analyzer/crates/ide-db/src/imports/import_assets.rs‎`

`‎src/tools/rust-analyzer/crates/ide-diagnostics/src/handlers/typed_hole.rs‎`

0 commit comments