From 3762cc7465e485948b426857b265f274688dedea Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 18 Jun 2021 23:56:15 +0300
Subject: [PATCH] minor: use minicore

---
 .../src/handlers/convert_into_to_from.rs      |  6 +----
 .../handlers/convert_iter_for_each_to_for.rs  | 14 ++++------
 .../src/handlers/replace_unwrap_with_match.rs |  7 +++--
 crates/ide_assists/src/tests/generated.rs     | 27 +++++++------------
 4 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/crates/ide_assists/src/handlers/convert_into_to_from.rs b/crates/ide_assists/src/handlers/convert_into_to_from.rs
index 79a0c487985..2d8b936cd69 100644
--- a/crates/ide_assists/src/handlers/convert_into_to_from.rs
+++ b/crates/ide_assists/src/handlers/convert_into_to_from.rs
@@ -13,10 +13,7 @@
 // Converts an Into impl to an equivalent From impl.
 //
 // ```
-// # //- /lib.rs crate:core
-// # pub mod convert { pub trait Into<T> { pub fn into(self) -> T; } }
-// # //- /lib.rs crate:main deps:core
-// # use core::convert::Into;
+// # //- minicore: from
 // impl $0Into<Thing> for usize {
 //     fn into(self) -> Thing {
 //         Thing {
@@ -28,7 +25,6 @@
 // ```
 // ->
 // ```
-// # use core::convert::Into;
 // impl From<usize> for Thing {
 //     fn from(val: usize) -> Self {
 //         Thing {
diff --git a/crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs b/crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs
index 7fd73d4c71c..70754adf9a5 100644
--- a/crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs
+++ b/crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs
@@ -11,14 +11,10 @@
 // Converts an Iterator::for_each function into a for loop.
 //
 // ```
-// # //- /lib.rs crate:core
-// # pub mod iter { pub mod traits { pub mod iterator { pub trait Iterator {} } } }
-// # pub struct SomeIter;
-// # impl self::iter::traits::iterator::Iterator for SomeIter {}
-// # //- /lib.rs crate:main deps:core
-// # use core::SomeIter;
+// # //- minicore: iterators
+// # use core::iter;
 // fn main() {
-//     let iter = SomeIter;
+//     let iter = iter::repeat((9, 2));
 //     iter.for_each$0(|(x, y)| {
 //         println!("x: {}, y: {}", x, y);
 //     });
@@ -26,9 +22,9 @@
 // ```
 // ->
 // ```
-// # use core::SomeIter;
+// # use core::iter;
 // fn main() {
-//     let iter = SomeIter;
+//     let iter = iter::repeat((9, 2));
 //     for (x, y) in iter {
 //         println!("x: {}, y: {}", x, y);
 //     }
diff --git a/crates/ide_assists/src/handlers/replace_unwrap_with_match.rs b/crates/ide_assists/src/handlers/replace_unwrap_with_match.rs
index 7e57353c646..f39c48d8f7b 100644
--- a/crates/ide_assists/src/handlers/replace_unwrap_with_match.rs
+++ b/crates/ide_assists/src/handlers/replace_unwrap_with_match.rs
@@ -20,17 +20,16 @@
 // Replaces `unwrap` with a `match` expression. Works for Result and Option.
 //
 // ```
-// enum Result<T, E> { Ok(T), Err(E) }
+// # //- minicore: result
 // fn main() {
-//     let x: Result<i32, i32> = Result::Ok(92);
+//     let x: Result<i32, i32> = Ok(92);
 //     let y = x.$0unwrap();
 // }
 // ```
 // ->
 // ```
-// enum Result<T, E> { Ok(T), Err(E) }
 // fn main() {
-//     let x: Result<i32, i32> = Result::Ok(92);
+//     let x: Result<i32, i32> = Ok(92);
 //     let y = match x {
 //         Ok(it) => it,
 //         $0_ => unreachable!(),
diff --git a/crates/ide_assists/src/tests/generated.rs b/crates/ide_assists/src/tests/generated.rs
index de5d9e55a10..1509c3c6339 100644
--- a/crates/ide_assists/src/tests/generated.rs
+++ b/crates/ide_assists/src/tests/generated.rs
@@ -209,10 +209,7 @@ fn doctest_convert_into_to_from() {
     check_doc_test(
         "convert_into_to_from",
         r#####"
-//- /lib.rs crate:core
-pub mod convert { pub trait Into<T> { pub fn into(self) -> T; } }
-//- /lib.rs crate:main deps:core
-use core::convert::Into;
+//- minicore: from
 impl $0Into<Thing> for usize {
     fn into(self) -> Thing {
         Thing {
@@ -223,7 +220,6 @@ fn into(self) -> Thing {
 }
 "#####,
         r#####"
-use core::convert::Into;
 impl From<usize> for Thing {
     fn from(val: usize) -> Self {
         Thing {
@@ -241,23 +237,19 @@ fn doctest_convert_iter_for_each_to_for() {
     check_doc_test(
         "convert_iter_for_each_to_for",
         r#####"
-//- /lib.rs crate:core
-pub mod iter { pub mod traits { pub mod iterator { pub trait Iterator {} } } }
-pub struct SomeIter;
-impl self::iter::traits::iterator::Iterator for SomeIter {}
-//- /lib.rs crate:main deps:core
-use core::SomeIter;
+//- minicore: iterators
+use core::iter;
 fn main() {
-    let iter = SomeIter;
+    let iter = iter::repeat((9, 2));
     iter.for_each$0(|(x, y)| {
         println!("x: {}, y: {}", x, y);
     });
 }
 "#####,
         r#####"
-use core::SomeIter;
+use core::iter;
 fn main() {
-    let iter = SomeIter;
+    let iter = iter::repeat((9, 2));
     for (x, y) in iter {
         println!("x: {}, y: {}", x, y);
     }
@@ -1519,16 +1511,15 @@ fn doctest_replace_unwrap_with_match() {
     check_doc_test(
         "replace_unwrap_with_match",
         r#####"
-enum Result<T, E> { Ok(T), Err(E) }
+//- minicore: result
 fn main() {
-    let x: Result<i32, i32> = Result::Ok(92);
+    let x: Result<i32, i32> = Ok(92);
     let y = x.$0unwrap();
 }
 "#####,
         r#####"
-enum Result<T, E> { Ok(T), Err(E) }
 fn main() {
-    let x: Result<i32, i32> = Result::Ok(92);
+    let x: Result<i32, i32> = Ok(92);
     let y = match x {
         Ok(it) => it,
         $0_ => unreachable!(),