nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-22 20:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't handle Self as a usage for TraitDefs

Browse Source
This commit is contained in:
Lukas Wirth 2021-05-08 23:30:19 +02:00
parent 04717b9bd2
commit 3a346412cf
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
crates/ide/src/references.rs
View File

@ -1163,33 +1163,38 @@ fn foo<const FOO$0: usize>() -> usize {
}
#[test]
fn test_find_self_ty_in_trait_def() {
fn test_trait() {
check(
r#"
trait Foo where Self: {
fn f() -> Self$0;
trait Foo$0 where Self: {}
impl Foo for () {}
"#,
expect![[r#"
Foo Trait FileId(0) 0..24 6..9
FileId(0) 31..34
"#]],
);
}
#[test]
fn test_trait_self() {
check(
r#"
trait Foo where Self$0 {
fn f() -> Self;
}
impl Foo for () {}
"#,
expect![[r#"
Self TypeParam FileId(0) 6..9 6..9
FileId(0) 16..20
FileId(0) 38..42
FileId(0) 37..41
"#]],
);
// check(
// r#"
// trait Foo$0 where Self: {
// fn f() -> Self;
// }
// "#,
// expect![[r#"
// Foo Trait FileId(0) 0..45 6..9
// FileId(0) 16..20
// FileId(0) 38..42
// "#]],
// );
}
#[test]
@ -1203,12 +1208,12 @@ trait Foo where Self: {
}
"#,
expect![[r#"
Foo Struct FileId(0) 0..11 7..10
Foo Struct FileId(0) 0..11 7..10
FileId(0) 18..21
FileId(0) 28..32
FileId(0) 50..54
"#]],
FileId(0) 18..21
FileId(0) 28..32
FileId(0) 50..54
"#]],
);
check(
r#"

1
crates/ide_db/src/search.rs
View File

@ -548,7 +548,6 @@ fn def_to_ty(sema: &Semantics<RootDatabase>, def: &Definition) -> Option<hir::Ty
let module = sema.to_module_def(root_file)?;
Some(it.ty(sema.db, module))
}
ModuleDef::Trait(_it) => None, // FIXME turn trait into its self-type
_ => None,
},
Definition::SelfType(it) => Some(it.self_ty(sema.db)),