3 files changed, 8 insertions, 24 deletions

diff --git a/crates/ide/src/goto_implementation.rs b/crates/ide/src/goto_implementation.rs
index 0013820b4..07686017d 100644
--- a/crates/ide/src/goto_implementation.rs
+++ b/crates/ide/src/goto_implementation.rs
@@ -236,15 +236,10 @@ impl T for &Foo {}
     fn goto_implementation_to_builtin_derive() {
         check(
             r#"
+//- minicore: copy, derive
   #[derive(Copy)]
 //^^^^^^^^^^^^^^^
 struct Foo$0;
-
-mod marker {
-    trait Copy {}
-}
-#[rustc_builtin_macro]
-macro Copy {}
 "#,
         );
     }
diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index 3c3de3ffd..2e1359eef 100644
--- a/crates/ide/src/hover.rs
+++ b/crates/ide/src/hover.rs
@@ -3014,8 +3014,8 @@ fn foo() {
                                     file_id: FileId(
                                         1,
                                     ),
-                                    full_range: 248..430,
-                                    focus_range: 287..293,
+                                    full_range: 251..433,
+                                    focus_range: 290..296,
                                     name: "Future",
                                     kind: Trait,
                                     description: "pub trait Future",
diff --git a/crates/ide/src/inlay_hints.rs b/crates/ide/src/inlay_hints.rs
index 335d57a0d..95f9edce4 100644
--- a/crates/ide/src/inlay_hints.rs
+++ b/crates/ide/src/inlay_hints.rs
@@ -661,9 +661,7 @@ fn main() {
     fn function_call_parameter_hint() {
         check_params(
             r#"
-enum Option<T> { None, Some(T) }
-use Option::*;
-
+//- minicore: option
 struct FileId {}
 struct SmolStr {}
 
@@ -872,7 +870,6 @@ fn main() {
         check_types(
             r#"
 //- minicore: fn, sized
-
 fn foo() -> impl Fn() { loop {} }
 fn foo1() -> impl Fn(f64) { loop {} }
 fn foo2() -> impl Fn(f64, f64) { loop {} }
@@ -908,9 +905,7 @@ fn main() {
     fn unit_structs_have_no_type_hints() {
         check_types(
             r#"
-enum Result<T, E> { Ok(T), Err(E) }
-use Result::*;
-
+//- minicore: result
 struct SyntheticSyntax;
 
 fn main() {
@@ -962,9 +957,7 @@ fn main() {
     fn if_expr() {
         check_types(
             r#"
-enum Option<T> { None, Some(T) }
-use Option::*;
-
+//- minicore: option
 struct Test { a: Option<u32>, b: u8 }
 
 fn main() {
@@ -994,9 +987,7 @@ fn main() {
     fn while_expr() {
         check_types(
             r#"
-enum Option<T> { None, Some(T) }
-use Option::*;
-
+//- minicore: option
 struct Test { a: Option<u32>, b: u8 }
 
 fn main() {
@@ -1012,9 +1003,7 @@ fn main() {
     fn match_arm_list() {
         check_types(
             r#"
-enum Option<T> { None, Some(T) }
-use Option::*;
-
+//- minicore: option
 struct Test { a: Option<u32>, b: u8 }
 
 fn main() {