From c133651e0a613d4833bba1c1f229222d060e2ba8 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Wed, 7 Oct 2020 10:14:42 +0200
Subject: Move IntoIterator into FamousDefs

---
 crates/assists/src/utils.rs   | 23 +++++++++++++++--------
 crates/ide/src/inlay_hints.rs | 28 +++++-----------------------
 2 files changed, 20 insertions(+), 31 deletions(-)

(limited to 'crates')

diff --git a/crates/assists/src/utils.rs b/crates/assists/src/utils.rs
index 0335969fd..b341453d4 100644
--- a/crates/assists/src/utils.rs
+++ b/crates/assists/src/utils.rs
@@ -286,14 +286,21 @@ pub mod convert {
 }
 
 pub mod iter {
-    pub use self::traits::iterator::Iterator;
-    mod traits { mod iterator {
-        use crate::option::Option;
-        pub trait Iterator {
-            type Item;
-            fn next(&mut self) -> Option<Self::Item>;
+    pub use self::traits::{collect::IntoIterator, iterator::Iterator};
+    mod traits {
+        mod iterator {
+            use crate::option::Option;
+            pub trait Iterator {
+                type Item;
+                fn next(&mut self) -> Option<Self::Item>;
+            }
+        }
+        mod collect {            
+            pub trait IntoIterator {
+                type Item;
+            }
         }
-    } }
+    }
 
     pub use self::sources::*;
     mod sources {
@@ -321,7 +328,7 @@ pub mod option {
 }
 
 pub mod prelude {
-    pub use crate::{convert::From, iter::Iterator, option::Option::{self, *}};
+    pub use crate::{convert::From, iter::{IntoIterator, Iterator}, option::Option::{self, *}};
 }
 #[prelude_import]
 pub use prelude::*;
diff --git a/crates/ide/src/inlay_hints.rs b/crates/ide/src/inlay_hints.rs
index 27bd1e37f..31a6a1be8 100644
--- a/crates/ide/src/inlay_hints.rs
+++ b/crates/ide/src/inlay_hints.rs
@@ -412,7 +412,8 @@ mod tests {
     }
 
     fn check_with_config(config: InlayHintsConfig, ra_fixture: &str) {
-        let (analysis, file_id) = fixture::file(ra_fixture);
+        let ra_fixture = format!("{}\n{}", ra_fixture, FamousDefs::FIXTURE);
+        let (analysis, file_id) = fixture::file(&ra_fixture);
         let expected = extract_annotations(&*analysis.file_text(file_id).unwrap());
         let inlay_hints = analysis.inlay_hints(file_id, &config).unwrap();
         let actual =
@@ -1011,13 +1012,6 @@ fn main() {
     println!("Unit expr");
 }
 
-//- /core.rs crate:core
-#[prelude_import] use iter::*;
-mod iter {
-    trait IntoIterator {
-        type Item;
-    }
-}
 //- /alloc.rs crate:alloc deps:core
 mod collections {
     struct Vec<T> {}
@@ -1059,14 +1053,6 @@ fn main() {
         //^ &str
     }
 }
-
-//- /core.rs crate:core
-#[prelude_import] use iter::*;
-mod iter {
-    trait IntoIterator {
-        type Item;
-    }
-}
 //- /alloc.rs crate:alloc deps:core
 mod collections {
     struct Vec<T> {}
@@ -1125,15 +1111,13 @@ fn main() {
                 chaining_hints: true,
                 max_length: None,
             },
-            &format!(
-                "{}\n{}\n",
-                r#"
+            r#"
 //- /main.rs crate:main deps:std
-use std::{Option::{self, Some, None}, iter};
+use std::iter;
 
 struct MyIter;
 
-impl iter::Iterator for MyIter {
+impl Iterator for MyIter {
     type Item = ();
     fn next(&mut self) -> Option<Self::Item> {
         None
@@ -1154,8 +1138,6 @@ fn main() {
 //- /std.rs crate:std deps:core
 use core::*;
 "#,
-                FamousDefs::FIXTURE
-            ),
         );
     }
 }
-- 
cgit v1.2.3