Auto merge of #18195 - davidbarsky:davidbarsky/push-xkqnsyksmzqv, r=Veykril

internal: remove `Default` from OpQueue
`@Wilfred` and I were talking about `OpQueue` and we identified one symptom of its (relative) weirdness is that `last_op_result` returns a `T::default()`; not `Option<&T>`, which means it's not possible to distinguish between "the `OpQueue` hasn't run yet" and "the OpQueue ran, but didn't produce a result". This branch fixes that.

Author: bors

src/tools/rust-analyzer/crates/rust-analyzer/src/global_state.rs

@@ -46,6 +46,11 @@ pub(crate) struct FetchWorkspaceRequest {
 pub(crate)force_crate_graph_reload:bool,
 }
 
+pub(crate)structFetchWorkspaceResponse{
+pub(crate)workspaces:Vec<anyhow::Result<ProjectWorkspace>>,
+pub(crate)force_crate_graph_reload:bool,
+}
+
 // Enforces drop order
 pub(crate)structHandle<H,C>{
 pub(crate)handle:H,
@@ -146,8 +151,7 @@ pub(crate) struct GlobalState {
 pub(crate)detached_files:FxHashSet<ManifestPath>,
 
 // op queues
-pub(crate)fetch_workspaces_queue:
-OpQueue<FetchWorkspaceRequest,Option<(Vec<anyhow::Result<ProjectWorkspace>>,bool)>>,
+pub(crate)fetch_workspaces_queue:OpQueue<FetchWorkspaceRequest,FetchWorkspaceResponse>,
 pub(crate)fetch_build_data_queue:
 OpQueue<(),(Arc<Vec<ProjectWorkspace>>,Vec<anyhow::Result<WorkspaceBuildScripts>>)>,
 pub(crate)fetch_proc_macros_queue:OpQueue<Vec<ProcMacroPaths>,bool>,
@@ -502,7 +506,7 @@ impl GlobalState {
 mem_docs:self.mem_docs.clone(),
 semantic_tokens_cache:Arc::clone(&self.semantic_tokens_cache),
 proc_macros_loaded: !self.config.expand_proc_macros()
- || *self.fetch_proc_macros_queue.last_op_result(),
+ || self.fetch_proc_macros_queue.last_op_result().copied().unwrap_or(false),
 flycheck:self.flycheck.clone(),
 }
 }

src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs

@@ -22,7 +22,9 @@ use crate::{
  diagnostics::{fetch_native_diagnostics,DiagnosticsGeneration,NativeDiagnosticsFetchKind},
  discover::{DiscoverArgument,DiscoverCommand,DiscoverProjectMessage},
  flycheck::{self,FlycheckMessage},
- global_state::{file_id_to_url, url_to_file_id,FetchWorkspaceRequest,GlobalState},
+ global_state::{
+ file_id_to_url, url_to_file_id,FetchWorkspaceRequest,FetchWorkspaceResponse,GlobalState,
+},
  hack_recover_crate_name,
  handlers::dispatch::{NotificationDispatcher,RequestDispatcher},
  lsp::{
@@ -695,9 +697,9 @@ impl GlobalState {
 let(state, msg) = match progress {
 ProjectWorkspaceProgress::Begin => (Progress::Begin,None),
 ProjectWorkspaceProgress::Report(msg) => (Progress::Report,Some(msg)),
-ProjectWorkspaceProgress::End(workspaces,force_reload_crate_graph) => {
-self.fetch_workspaces_queue
-.op_completed(Some((workspaces, force_reload_crate_graph)));
+ProjectWorkspaceProgress::End(workspaces,force_crate_graph_reload) => {
+let resp = FetchWorkspaceResponse{ workspaces, force_crate_graph_reload };
+self.fetch_workspaces_queue.op_completed(resp);
 ifletErr(e) = self.fetch_workspace_error(){
 error!("FetchWorkspaceError: {e}");
 }

src/tools/rust-analyzer/crates/rust-analyzer/src/op_queue.rs

@@ -27,12 +27,12 @@ pub(crate) type Cause = String;
 pub(crate)structOpQueue<Args = (),Output = ()>{
 op_requested:Option<(Cause,Args)>,
 op_in_progress:bool,
-last_op_result:Output,
+last_op_result:Option<Output>,
 }
 
-impl<Args,Output:Default>DefaultforOpQueue<Args,Output>{
+impl<Args,Output>DefaultforOpQueue<Args,Output>{
 fndefault() -> Self{
-Self{op_requested:None,op_in_progress:false,last_op_result:Default::default()}
+Self{op_requested:None,op_in_progress:false,last_op_result:None}
 }
 }
 
@@ -56,12 +56,12 @@ impl<Args, Output> OpQueue<Args, Output> {
 pub(crate)fnop_completed(&mutself,result:Output){
 assert!(self.op_in_progress);
 self.op_in_progress = false;
-self.last_op_result = result;
+self.last_op_result = Some(result);
 }
 
 /// Get the result of the last operation.
-pub(crate)fnlast_op_result(&self) -> &Output{
-&self.last_op_result
+pub(crate)fnlast_op_result(&self) -> Option<&Output>{
+self.last_op_result.as_ref()
 }
 
 // Is there an operation that has started, but hasn't yet finished?

src/tools/rust-analyzer/crates/rust-analyzer/src/reload.rs

@@ -33,7 +33,7 @@ use vfs::{AbsPath, AbsPathBuf, ChangeKind};
 usecrate::{
  config::{Config,FilesWatcher,LinkedProject},
  flycheck::{FlycheckConfig,FlycheckHandle},
- global_state::{FetchWorkspaceRequest,GlobalState},
+ global_state::{FetchWorkspaceRequest,FetchWorkspaceResponse,GlobalState},
  lsp_ext,
  main_loop::{DiscoverProjectParam,Task},
  op_queue::Cause,
@@ -448,15 +448,15 @@ impl GlobalState {
 let _p = tracing::info_span!("GlobalState::switch_workspaces").entered();
  tracing::info!(%cause,"will switch workspaces");
 
-letSome((workspaces,force_reload_crate_graph)) =
+letSome(FetchWorkspaceResponse{workspaces,force_crate_graph_reload }) =
 self.fetch_workspaces_queue.last_op_result()
 else{
 return;
 };
 
-info!(%cause, ?force_reload_crate_graph);
+info!(%cause, ?force_crate_graph_reload);
 ifself.fetch_workspace_error().is_err() && !self.workspaces.is_empty(){
-if*force_reload_crate_graph{
+if*force_crate_graph_reload{
 self.recreate_crate_graph(cause);
 }
 // It only makes sense to switch to a partially broken workspace
@@ -474,8 +474,12 @@ impl GlobalState {
 .all(|(l, r)| l.eq_ignore_build_data(r));
 
 if same_workspaces {
-let(workspaces, build_scripts) = self.fetch_build_data_queue.last_op_result();
-ifArc::ptr_eq(workspaces,&self.workspaces){
+let(workspaces, build_scripts) = matchself.fetch_build_data_queue.last_op_result(){
+Some((workspaces, build_scripts)) => (workspaces.clone(), build_scripts.as_slice()),
+None => (Default::default(),Default::default()),
+};
+
+ifArc::ptr_eq(&workspaces,&self.workspaces){
 info!("set build scripts to workspaces");
 
 let workspaces = workspaces
@@ -492,7 +496,7 @@ impl GlobalState {
 self.workspaces = Arc::new(workspaces);
 }else{
 info!("build scripts do not match the version of the active workspace");
-if*force_reload_crate_graph{
+if*force_crate_graph_reload{
 self.recreate_crate_graph(cause);
 }
 
@@ -739,14 +743,16 @@ impl GlobalState {
 pub(super)fnfetch_workspace_error(&self) -> Result<(),String>{
 letmut buf = String::new();
 
-letSome((last_op_result, _)) = self.fetch_workspaces_queue.last_op_result()else{
+letSome(FetchWorkspaceResponse{ workspaces, .. }) =
+self.fetch_workspaces_queue.last_op_result()
+else{
 returnOk(());
 };
 
-iflast_op_result.is_empty() && self.config.discover_workspace_config().is_none(){
+ifworkspaces.is_empty() && self.config.discover_workspace_config().is_none(){
  stdx::format_to!(buf,"rust-analyzer failed to fetch workspace");
 }else{
-for ws inlast_op_result{
+for ws inworkspaces{
 ifletErr(err) = ws {
  stdx::format_to!(buf,"rust-analyzer failed to load workspace: {:#}\n", err);
 }
@@ -763,7 +769,11 @@ impl GlobalState {
 pub(super)fnfetch_build_data_error(&self) -> Result<(),String>{
 letmut buf = String::new();
 
-for ws in&self.fetch_build_data_queue.last_op_result().1{
+letSome((_, ws)) = &self.fetch_build_data_queue.last_op_result()else{
+returnOk(());
+};
+
+for ws in ws {
 match ws {
 Ok(data) => {
 ifletSome(stderr) = data.error(){