11 files changed, 76 insertions, 139 deletions

diff --git a/crates/ide_assists/src/handlers/auto_import.rs b/crates/ide_assists/src/handlers/auto_import.rs
index d4748ef3a..accc345fc 100644
--- a/crates/ide_assists/src/handlers/auto_import.rs
+++ b/crates/ide_assists/src/handlers/auto_import.rs
@@ -103,8 +103,9 @@ pub(crate) fn auto_import(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
                 let scope = match scope.clone() {
                     ImportScope::File(it) => ImportScope::File(builder.make_mut(it)),
                     ImportScope::Module(it) => ImportScope::Module(builder.make_mut(it)),
+                    ImportScope::Block(it) => ImportScope::Block(builder.make_mut(it)),
                 };
-                insert_use(&scope, mod_path_to_ast(&import.import_path), ctx.config.insert_use);
+                insert_use(&scope, mod_path_to_ast(&import.import_path), &ctx.config.insert_use);
             },
         );
     }
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 79a0c4879..2d8b936cd 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 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // 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 crate::{AssistContext, AssistId, AssistKind, Assists};
 // ```
 // ->
 // ```
-// # 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 7fd73d4c7..70754adf9 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 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
 // 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 crate::{AssistContext, AssistId, AssistKind, Assists};
 // ```
 // ->
 // ```
-// # 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/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs
index 43e83d683..ac7f0959b 100644
--- a/crates/ide_assists/src/handlers/extract_function.rs
+++ b/crates/ide_assists/src/handlers/extract_function.rs
@@ -831,7 +831,6 @@ fn path_element_of_reference(
     })?;
     stdx::always!(
         matches!(path, ast::Expr::PathExpr(_) | ast::Expr::MacroCall(_)),
-
         "unexpected expression type for variable usage: {:?}",
         path
     );
@@ -2991,11 +2990,7 @@ mod bar {
         check_assist(
             extract_function,
             r#"
-enum Option<T> {
-    #[lang = "None"] None,
-    #[lang = "Some"] Some(T),
-}
-use Option::*;
+//- minicore: option
 fn foo() {
     loop {
         let n = 1;
@@ -3007,11 +3002,6 @@ fn foo() {
 }
 "#,
             r#"
-enum Option<T> {
-    #[lang = "None"] None,
-    #[lang = "Some"] Some(T),
-}
-use Option::*;
 fn foo() {
     loop {
         let n = 1;
diff --git a/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
index 6c6ff16c2..430710448 100644
--- a/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -236,7 +236,7 @@ fn apply_references(
     import: Option<(ImportScope, hir::ModPath)>,
 ) {
     if let Some((scope, path)) = import {
-        insert_use(&scope, mod_path_to_ast(&path), insert_use_cfg);
+        insert_use(&scope, mod_path_to_ast(&path), &insert_use_cfg);
     }
     // deep clone to prevent cycle
     let path = make::path_from_segments(iter::once(segment.clone_subtree()), false);
diff --git a/crates/ide_assists/src/handlers/fill_match_arms.rs b/crates/ide_assists/src/handlers/fill_match_arms.rs
index cd0f6dba9..318faa0fc 100644
--- a/crates/ide_assists/src/handlers/fill_match_arms.rs
+++ b/crates/ide_assists/src/handlers/fill_match_arms.rs
@@ -481,26 +481,21 @@ fn main() {
         check_assist(
             fill_match_arms,
             r#"
-enum Option<T> { Some(T), None }
-use Option::*;
-
+//- minicore: option
 fn main() {
     match None$0 {
         None => {}
     }
 }
-            "#,
+"#,
             r#"
-enum Option<T> { Some(T), None }
-use Option::*;
-
 fn main() {
     match None {
         None => {}
         Some(${0:_}) => todo!(),
     }
 }
-            "#,
+"#,
         );
     }
 
diff --git a/crates/ide_assists/src/handlers/replace_if_let_with_match.rs b/crates/ide_assists/src/handlers/replace_if_let_with_match.rs
index 9404aa26d..f37aa0d53 100644
--- a/crates/ide_assists/src/handlers/replace_if_let_with_match.rs
+++ b/crates/ide_assists/src/handlers/replace_if_let_with_match.rs
@@ -262,9 +262,7 @@ impl VariantData {
         check_assist(
             replace_if_let_with_match,
             r#"
-enum Option<T> { Some(T), None }
-use Option::*;
-
+//- minicore: option
 fn foo(x: Option<i32>) {
     $0if let Some(x) = x {
         println!("{}", x)
@@ -272,18 +270,15 @@ fn foo(x: Option<i32>) {
         println!("none")
     }
 }
-           "#,
+"#,
             r#"
-enum Option<T> { Some(T), None }
-use Option::*;
-
 fn foo(x: Option<i32>) {
     match x {
         Some(x) => println!("{}", x),
         None => println!("none"),
     }
 }
-           "#,
+"#,
         );
     }
 
@@ -292,9 +287,7 @@ fn foo(x: Option<i32>) {
         check_assist(
             replace_if_let_with_match,
             r#"
-enum Option<T> { Some(T), None }
-use Option::*;
-
+//- minicore: option
 fn foo(x: Option<i32>) {
     $0if let None = x {
         println!("none")
@@ -302,18 +295,15 @@ fn foo(x: Option<i32>) {
         println!("some")
     }
 }
-           "#,
+"#,
             r#"
-enum Option<T> { Some(T), None }
-use Option::*;
-
 fn foo(x: Option<i32>) {
     match x {
         None => println!("none"),
         Some(_) => println!("some"),
     }
 }
-           "#,
+"#,
         );
     }
 
@@ -322,9 +312,7 @@ fn foo(x: Option<i32>) {
         check_assist(
             replace_if_let_with_match,
             r#"
-enum Result<T, E> { Ok(T), Err(E) }
-use Result::*;
-
+//- minicore: result
 fn foo(x: Result<i32, ()>) {
     $0if let Ok(x) = x {
         println!("{}", x)
@@ -332,18 +320,15 @@ fn foo(x: Result<i32, ()>) {
         println!("none")
     }
 }
-           "#,
+"#,
             r#"
-enum Result<T, E> { Ok(T), Err(E) }
-use Result::*;
-
 fn foo(x: Result<i32, ()>) {
     match x {
         Ok(x) => println!("{}", x),
         Err(_) => println!("none"),
     }
 }
-           "#,
+"#,
         );
     }
 
@@ -352,9 +337,7 @@ fn foo(x: Result<i32, ()>) {
         check_assist(
             replace_if_let_with_match,
             r#"
-enum Result<T, E> { Ok(T), Err(E) }
-use Result::*;
-
+//- minicore: result
 fn foo(x: Result<i32, ()>) {
     $0if let Err(x) = x {
         println!("{}", x)
@@ -362,18 +345,15 @@ fn foo(x: Result<i32, ()>) {
         println!("ok")
     }
 }
-           "#,
+"#,
             r#"
-enum Result<T, E> { Ok(T), Err(E) }
-use Result::*;
-
 fn foo(x: Result<i32, ()>) {
     match x {
         Err(x) => println!("{}", x),
         Ok(_) => println!("ok"),
     }
 }
-           "#,
+"#,
         );
     }
 
@@ -488,20 +468,15 @@ impl VariantData {
         check_assist(
             replace_match_with_if_let,
             r#"
-enum Option<T> { Some(T), None }
-use Option::*;
-
+//- minicore: option
 fn foo(x: Option<i32>) {
     $0match x {
         Some(x) => println!("{}", x),
         None => println!("none"),
     }
 }
-           "#,
+"#,
             r#"
-enum Option<T> { Some(T), None }
-use Option::*;
-
 fn foo(x: Option<i32>) {
     if let Some(x) = x {
         println!("{}", x)
@@ -509,7 +484,7 @@ fn foo(x: Option<i32>) {
         println!("none")
     }
 }
-           "#,
+"#,
         );
     }
 
@@ -518,20 +493,15 @@ fn foo(x: Option<i32>) {
         check_assist(
             replace_match_with_if_let,
             r#"
-enum Result<T, E> { Ok(T), Err(E) }
-use Result::*;
-
+//- minicore: result
 fn foo(x: Result<i32, ()>) {
     $0match x {
         Ok(x) => println!("{}", x),
         Err(_) => println!("none"),
     }
 }
-           "#,
+"#,
             r#"
-enum Result<T, E> { Ok(T), Err(E) }
-use Result::*;
-
 fn foo(x: Result<i32, ()>) {
     if let Ok(x) = x {
         println!("{}", x)
@@ -539,7 +509,7 @@ fn foo(x: Result<i32, ()>) {
         println!("none")
     }
 }
-           "#,
+"#,
         );
     }
 
diff --git a/crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs b/crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs
index 39f5eb4ff..26778ee74 100644
--- a/crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs
+++ b/crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs
@@ -32,7 +32,6 @@ pub(crate) fn replace_qualified_name_with_use(
 
     let target = path.syntax().text_range();
     let scope = ImportScope::find_insert_use_container_with_macros(path.syntax(), &ctx.sema)?;
-    let syntax = scope.as_syntax_node();
     acc.add(
         AssistId("replace_qualified_name_with_use", AssistKind::RefactorRewrite),
         "Replace qualified path with use",
@@ -40,11 +39,13 @@ pub(crate) fn replace_qualified_name_with_use(
         |builder| {
             // Now that we've brought the name into scope, re-qualify all paths that could be
             // affected (that is, all paths inside the node we added the `use` to).
-            let syntax = builder.make_syntax_mut(syntax.clone());
-            if let Some(ref import_scope) = ImportScope::from(syntax.clone()) {
-                shorten_paths(&syntax, &path.clone_for_update());
-                insert_use(import_scope, path, ctx.config.insert_use);
-            }
+            let scope = match scope {
+                ImportScope::File(it) => ImportScope::File(builder.make_mut(it)),
+                ImportScope::Module(it) => ImportScope::Module(builder.make_mut(it)),
+                ImportScope::Block(it) => ImportScope::Block(builder.make_mut(it)),
+            };
+            shorten_paths(scope.as_syntax_node(), &path.clone_for_update());
+            insert_use(&scope, path, &ctx.config.insert_use);
         },
     )
 }
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 a3bfa221c..f39c48d8f 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 @@ use ide_db::ty_filter::TryEnum;
 // 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!(),
@@ -97,25 +96,24 @@ mod tests {
     fn test_replace_result_unwrap_with_match() {
         check_assist(
             replace_unwrap_with_match,
-            r"
-enum Result<T, E> { Ok(T), Err(E) }
+            r#"
+//- minicore: result
 fn i<T>(a: T) -> T { a }
 fn main() {
-    let x: Result<i32, i32> = Result::Ok(92);
+    let x: Result<i32, i32> = Ok(92);
     let y = i(x).$0unwrap();
 }
-            ",
-            r"
-enum Result<T, E> { Ok(T), Err(E) }
+"#,
+            r#"
 fn i<T>(a: T) -> T { a }
 fn main() {
-    let x: Result<i32, i32> = Result::Ok(92);
+    let x: Result<i32, i32> = Ok(92);
     let y = match i(x) {
         Ok(it) => it,
         $0_ => unreachable!(),
     };
 }
-            ",
+"#,
         )
     }
 
@@ -123,25 +121,24 @@ fn main() {
     fn test_replace_option_unwrap_with_match() {
         check_assist(
             replace_unwrap_with_match,
-            r"
-enum Option<T> { Some(T), None }
+            r#"
+//- minicore: option
 fn i<T>(a: T) -> T { a }
 fn main() {
-    let x = Option::Some(92);
+    let x = Some(92);
     let y = i(x).$0unwrap();
 }
-            ",
-            r"
-enum Option<T> { Some(T), None }
+"#,
+            r#"
 fn i<T>(a: T) -> T { a }
 fn main() {
-    let x = Option::Some(92);
+    let x = Some(92);
     let y = match i(x) {
         Some(it) => it,
         $0_ => unreachable!(),
     };
 }
-            ",
+"#,
         );
     }
 
@@ -149,25 +146,24 @@ fn main() {
     fn test_replace_result_unwrap_with_match_chaining() {
         check_assist(
             replace_unwrap_with_match,
-            r"
-enum Result<T, E> { Ok(T), Err(E) }
+            r#"
+//- minicore: result
 fn i<T>(a: T) -> T { a }
 fn main() {
-    let x: Result<i32, i32> = Result::Ok(92);
+    let x: Result<i32, i32> = Ok(92);
     let y = i(x).$0unwrap().count_zeroes();
 }
-            ",
-            r"
-enum Result<T, E> { Ok(T), Err(E) }
+"#,
+            r#"
 fn i<T>(a: T) -> T { a }
 fn main() {
-    let x: Result<i32, i32> = Result::Ok(92);
+    let x: Result<i32, i32> = Ok(92);
     let y = match i(x) {
         Ok(it) => it,
         $0_ => unreachable!(),
     }.count_zeroes();
 }
-            ",
+"#,
         )
     }
 
@@ -175,14 +171,14 @@ fn main() {
     fn replace_unwrap_with_match_target() {
         check_assist_target(
             replace_unwrap_with_match,
-            r"
-enum Option<T> { Some(T), None }
+            r#"
+//- minicore: option
 fn i<T>(a: T) -> T { a }
 fn main() {
-    let x = Option::Some(92);
+    let x = Some(92);
     let y = i(x).$0unwrap();
 }
-            ",
+"#,
             r"i(x).unwrap()",
         );
     }
diff --git a/crates/ide_assists/src/tests.rs b/crates/ide_assists/src/tests.rs
index 4e96ff1ec..841537c77 100644
--- a/crates/ide_assists/src/tests.rs
+++ b/crates/ide_assists/src/tests.rs
@@ -28,6 +28,7 @@ pub(crate) const TEST_CONFIG: AssistConfig = AssistConfig {
         prefix_kind: hir::PrefixKind::Plain,
         enforce_granularity: true,
         group: true,
+        skip_glob_imports: true,
     },
 };
 
diff --git a/crates/ide_assists/src/tests/generated.rs b/crates/ide_assists/src/tests/generated.rs
index de5d9e55a..1509c3c63 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 @@ impl $0Into<Thing> for usize {
 }
 "#####,
         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!(),