Auto merge of #16461 - Veykril:expansion-info, r=Veykril

internal: Remove unnecessary usages of ExpansionInfo

And some follow up simplifications to https://github.com/rust-lang/rust-analyzer/pull/16439

crates/ide/src/goto_definition.rs

@@ -241,9 +241,8 @@ mod tests {
     fn goto_def_in_included_file() {
         check(
             r#"
+//- minicore:include
 //- /main.rs
-#[rustc_builtin_macro]
-macro_rules! include {}
 
 include!("a.rs");
 
@@ -256,6 +255,35 @@ fn func_in_include() {
  //^^^^^^^^^^^^^^^
 }
 
+fn foo() {
+    func_in_include$0();
+}
+"#,
+        );
+    }
+
+    #[test]
+    fn goto_def_in_included_file_nested() {
+        check(
+            r#"
+//- minicore:include
+//- /main.rs
+
+macro_rules! passthrough {
+    ($($tt:tt)*) => { $($tt)* }
+}
+
+passthrough!(include!("a.rs"));
+
+fn main() {
+    foo();
+}
+
+//- /a.rs
+fn func_in_include() {
+ //^^^^^^^^^^^^^^^
+}
+
 fn foo() {
     func_in_include$0();
 }