user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19684 from darichey/error-parse-discover

Browse source 
Always error when failed to parse DiscoverProjectMessage
This commit is contained in:
Lukas Wirth 2025-04-25 04:48:46 +00:00 • committed by GitHub
commit 40a3f84b67
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/tools/rust-analyzer/crates/rust-analyzer/src/discover.rs
View file

@ -7,7 +7,6 @@ use ide_db::FxHashMap;
use paths::{AbsPathBuf, Utf8Path, Utf8PathBuf};
use project_model::ProjectJsonData;
use serde::{Deserialize, Serialize};
use serde_json::Value;
use tracing::{info_span, span::EnteredSpan};
use crate::command::{CargoParser, CommandHandle};
@ -121,18 +120,19 @@ struct DiscoverProjectParser;
impl CargoParser<DiscoverProjectMessage> for DiscoverProjectParser {
fn from_line(&self, line: &str, _error: &mut String) -> Option<DiscoverProjectMessage> {
// can the line even be deserialized as JSON?
let Ok(data) = serde_json::from_str::<Value>(line) else {
let err = DiscoverProjectData::Error { error: line.to_owned(), source: None };
return Some(DiscoverProjectMessage::new(err));
};
let Ok(data) = serde_json::from_value::<DiscoverProjectData>(data) else {
return None;
};
let msg = DiscoverProjectMessage::new(data);
Some(msg)
match serde_json::from_str::<DiscoverProjectData>(line) {
Ok(data) => {
let msg = DiscoverProjectMessage::new(data);
Some(msg)
}
Err(err) => {
let err = DiscoverProjectData::Error {
error: format!("{:#?}\n{}", err, line),
source: None,
};
Some(DiscoverProjectMessage::new(err))
}
}
}
fn from_eof(&self) -> Option<DiscoverProjectMessage> {