From 8e086c00e06f6e884d7a66638a45b199317b2257 Mon Sep 17 00:00:00 2001
From: marmeladema <xademax@gmail.com>
Date: Wed, 3 Jun 2020 14:20:08 +0100
Subject: [PATCH] Do not pass `expanded_crate` as argument to `process_crate`
 anymore

Upstream `save_analysis` crate has been updated to work on HIR tree
directly instead of AST and thus does not require access to the
expanded AST anymore.
---
 rls-rustc/src/lib.rs   | 5 -----
 rls/src/build/rustc.rs | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/rls-rustc/src/lib.rs b/rls-rustc/src/lib.rs
index 167e90ec1b3..922677c65a1 100644
--- a/rls-rustc/src/lib.rs
+++ b/rls-rustc/src/lib.rs
@@ -169,9 +169,6 @@ impl Callbacks for ShimCalls {
         let input = compiler.input();
         let crate_name = queries.crate_name().unwrap().peek().clone();
 
-        // Guaranteed to not be dropped yet in the pipeline thanks to the
-        // `config.opts.debugging_opts.save_analysis` value being set to `true`.
-        let expanded_crate = &queries.expansion().unwrap().peek().0;
         queries.global_ctxt().unwrap().peek_mut().enter(|tcx| {
             // There are two ways to move the data from rustc to the RLS, either
             // directly or by serialising and deserialising. We only want to do
@@ -179,7 +176,6 @@ impl Callbacks for ShimCalls {
 
             // This version passes via JSON, it is more easily backwards compatible.
             // save::process_crate(state.tcx.unwrap(),
-            //                     state.expanded_crate.unwrap(),
             //                     state.analysis.unwrap(),
             //                     state.crate_name.unwrap(),
             //                     state.input,
@@ -189,7 +185,6 @@ impl Callbacks for ShimCalls {
             // This version passes directly, it is more efficient.
             rustc_save_analysis::process_crate(
                 tcx,
-                &expanded_crate,
                 &crate_name,
                 &input,
                 None,
diff --git a/rls/src/build/rustc.rs b/rls/src/build/rustc.rs
index 44b5f5f86c0..272710f77bb 100644
--- a/rls/src/build/rustc.rs
+++ b/rls/src/build/rustc.rs
@@ -276,9 +276,6 @@ impl rustc_driver::Callbacks for RlsRustcCalls {
         let input = compiler.input();
         let crate_name = queries.crate_name().unwrap().peek().clone();
 
-        // Guaranteed to not be dropped yet in the pipeline thanks to the
-        // `config.opts.debugging_opts.save_analysis` value being set to `true`.
-        let expanded_crate = &queries.expansion().unwrap().peek().0;
         queries.global_ctxt().unwrap().peek_mut().enter(|tcx| {
             // There are two ways to move the data from rustc to the RLS, either
             // directly or by serialising and deserialising. We only want to do
@@ -286,7 +283,6 @@ impl rustc_driver::Callbacks for RlsRustcCalls {
 
             // This version passes via JSON, it is more easily backwards compatible.
             // save::process_crate(state.tcx.unwrap(),
-            //                     state.expanded_crate.unwrap(),
             //                     state.analysis.unwrap(),
             //                     state.crate_name.unwrap(),
             //                     state.input,
@@ -296,7 +292,6 @@ impl rustc_driver::Callbacks for RlsRustcCalls {
             // This version passes directly, it is more efficient.
             save::process_crate(
                 tcx,
-                &expanded_crate,
                 &crate_name,
                 &input,
                 None,