Merge #2679

2679: Resolve traits for infer using lang item infrastructure r=matklad a=kiljacken

As we already have the infrastructure for collecting lang items, use it to find the right traits when doing type-inference.

Co-authored-by: Emil Lauridsen <[email protected]>

1 files changed, 5 insertions, 0 deletions

diff --git a/crates/ra_hir_ty/src/tests/traits.rs b/crates/ra_hir_ty/src/tests/traits.rs
index 0bc72644a..4b268510c 100644
--- a/crates/ra_hir_ty/src/tests/traits.rs
+++ b/crates/ra_hir_ty/src/tests/traits.rs
@@ -27,6 +27,7 @@ fn test() {
 //- /std.rs crate:std
 #[prelude_import] use future::*;
 mod future {
+    #[lang = "future_trait"]
     trait Future {
         type Output;
     }
@@ -56,6 +57,7 @@ fn test() {
 //- /std.rs crate:std
 #[prelude_import] use future::*;
 mod future {
+    #[lang = "future_trait"]
     trait Future {
         type Output;
     }
@@ -198,6 +200,7 @@ fn test() {
 
 #[prelude_import] use ops::*;
 mod ops {
+    #[lang = "neg"]
     pub trait Neg {
         type Output;
     }
@@ -230,6 +233,7 @@ fn test() {
 
 #[prelude_import] use ops::*;
 mod ops {
+    #[lang = "not"]
     pub trait Not {
         type Output;
     }
@@ -506,6 +510,7 @@ fn test() {
 
 #[prelude_import] use ops::*;
 mod ops {
+    #[lang = "index"]
     pub trait Index<Idx> {
         type Output;
     }