Merge pull request #18805 from Veykril/push-pzurvxvoolxs

internal: Implement `<RaSpanServer as SourceFile>::eq`

Author: Veykril

src/tools/rust-analyzer/crates/hir-def/src/body/tests.rs

@@ -52,6 +52,7 @@ fn your_stack_belongs_to_me() {
  cov_mark::check!(your_stack_belongs_to_me);
 lower(
 r#"
+#![recursion_limit = "32"]
 macro_rules! n_nuple {
  ($e:tt) => ();
  ($($rest:tt)*) => {{
@@ -68,6 +69,7 @@ fn your_stack_belongs_to_me2() {
  cov_mark::check!(overflow_but_not_me);
 lower(
 r#"
+#![recursion_limit = "32"]
 macro_rules! foo {
  () => {{ foo!(); foo!(); }}
 }
@@ -78,8 +80,6 @@ fn main() { foo!(); }
 
 #[test]
 fnrecursion_limit(){
- cov_mark::check!(your_stack_belongs_to_me);
-
 lower(
 r#"
 #![recursion_limit = "2"]

src/tools/rust-analyzer/crates/hir-def/src/nameres/collector.rs

@@ -1451,13 +1451,7 @@ impl DefCollector<'_> {
 depth:usize,
 container:ItemContainerId,
 ){
-let recursion_limit = self.def_map.recursion_limit()asusize;
-let recursion_limit = Limit::new(ifcfg!(test){
-// Without this, `body::tests::your_stack_belongs_to_me` stack-overflows in debug
- std::cmp::min(32, recursion_limit)
-}else{
- recursion_limit
-});
+let recursion_limit = Limit::new(self.def_map.recursion_limit()asusize);
 if recursion_limit.check(depth).is_err(){
  cov_mark::hit!(macro_expansion_overflow);
  tracing::warn!("macro expansion is too deep");

src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs

@@ -12,7 +12,7 @@ use std::{
 
 use intern::Symbol;
 use proc_macro::bridge::{self, server};
-use span::{Span,FIXUP_ERASED_FILE_AST_ID_MARKER};
+use span::{FileId,Span,FIXUP_ERASED_FILE_AST_ID_MARKER};
 use tt::{TextRange,TextSize};
 
 usecrate::server_impl::{
@@ -32,8 +32,10 @@ mod tt {
 
 typeTokenStream = crate::server_impl::TokenStream<Span>;
 
-#[derive(Clone)]
-pubstructSourceFile;
+#[derive(Copy,Clone,PartialEq,Eq,Debug)]
+pubstructSourceFile{
+file_id:FileId,
+}
 pubstructFreeFunctions;
 
 pubstructRaSpanServer{
@@ -291,9 +293,8 @@ impl server::TokenStream for RaSpanServer {
 }
 
 impl server::SourceFileforRaSpanServer{
-fneq(&mutself,_file1:&Self::SourceFile,_file2:&Self::SourceFile) -> bool{
-// FIXME
-true
+fneq(&mutself,file1:&Self::SourceFile,file2:&Self::SourceFile) -> bool{
+ file1 == file2
 }
 fnpath(&mutself,_file:&Self::SourceFile) -> String{
 // FIXME
@@ -308,9 +309,8 @@ impl server::Span for RaSpanServer {
 fndebug(&mutself,span:Self::Span) -> String{
 format!("{:?}", span)
 }
-fnsource_file(&mutself,_span:Self::Span) -> Self::SourceFile{
-// FIXME stub, requires db
-SourceFile{}
+fnsource_file(&mutself,span:Self::Span) -> Self::SourceFile{
+SourceFile{file_id: span.anchor.file_id.file_id()}
 }
 fnsave_span(&mutself,_span:Self::Span) -> usize{
 // FIXME, quote is incompatible with third-party tools