dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #17992 - Wilfred:newlines_in_logs, r=Veykril 

internal: Avoid newlines in fetch errors

Most logs lines don't have newlines, ensure fetch errors follow this pattern. This makes it easier to see which log line is associated with the error.

Before:

    2024-08-28T21:11:58.431856Z ERROR FetchWorkspaceError:
    rust-analyzer failed to discover workspace

After:

    2024-08-28T21:11:58.431856Z ERROR FetchWorkspaceError: rust-analyzer failed to discover workspace
This commit is contained in:
bors 2024-08-29 04:52:11 +00:00
parent 248a55723b 5aefe78301
commit 3a14e301dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs
View File

@ -689,7 +689,7 @@ impl GlobalState {
self.fetch_workspaces_queue self.fetch_workspaces_queue
.op_completed(Some((workspaces, force_reload_crate_graph))); .op_completed(Some((workspaces, force_reload_crate_graph)));
if let Err(e) = self.fetch_workspace_error() { if let Err(e) = self.fetch_workspace_error() {
error!("FetchWorkspaceError:\n{e}"); error!("FetchWorkspaceError: {e}");
} }
self.wants_to_switch = Some("fetched workspace".to_owned()); self.wants_to_switch = Some("fetched workspace".to_owned());
(Progress::End, None) (Progress::End, None)
@ -729,7 +729,7 @@ impl GlobalState {
BuildDataProgress::End(build_data_result) => { BuildDataProgress::End(build_data_result) => {
self.fetch_build_data_queue.op_completed(build_data_result); self.fetch_build_data_queue.op_completed(build_data_result);
if let Err(e) = self.fetch_build_data_error() { if let Err(e) = self.fetch_build_data_error() {
error!("FetchBuildDataError:\n{e}"); error!("FetchBuildDataError: {e}");
} }
if self.wants_to_switch.is_none() { if self.wants_to_switch.is_none() {