Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 04:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Flycheck tries to parse both Cargo and Rustc messages.

Browse source
This commit is contained in:
James Leitch 2021-04-18 16:36:29 -07:00
parent d39873e88b
commit b5c194f3f7
3 changed files with 47 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -396,6 +396,7 @@ dependencies = [
"crossbeam-channel",
"jod-thread",
"log",
"serde",
"serde_json",
"stdx",
"toolchain",

1
crates/flycheck/Cargo.toml
View file

@ -13,6 +13,7 @@ doctest = false
crossbeam-channel = "0.5.0"
log = "0.4.8"
cargo_metadata = "0.13"
serde = { version = "1.0.106", features = ["derive"] }
serde_json = "1.0.48"
jod-thread = "0.1.1"

67
crates/flycheck/src/lib.rs
View file

@ -4,13 +4,14 @@
use std::{
fmt,
io::{self, BufReader},
io::{self, BufRead, BufReader},
path::PathBuf,
process::{self, Command, Stdio},
time::Duration,
};
use crossbeam_channel::{never, select, unbounded, Receiver, Sender};
use serde::Deserialize;
use stdx::JodChild;
pub use cargo_metadata::diagnostic::{
@ -128,7 +129,7 @@ struct FlycheckActor {
enum Event {
Restart(Restart),
CheckEvent(Option<cargo_metadata::Message>),
CheckEvent(Option<CargoMessage>),
}
impl FlycheckActor {
@ -180,21 +181,16 @@ impl FlycheckActor {
self.progress(Progress::DidFinish(res));
}
Event::CheckEvent(Some(message)) => match message {
cargo_metadata::Message::CompilerArtifact(msg) => {
CargoMessage::CompilerArtifact(msg) => {
self.progress(Progress::DidCheckCrate(msg.target.name));
}
cargo_metadata::Message::CompilerMessage(msg) => {
CargoMessage::Diagnostic(msg) => {
self.send(Message::AddDiagnostic {
workspace_root: self.workspace_root.clone(),
diagnostic: msg.message,
diagnostic: msg,
});
}
cargo_metadata::Message::BuildScriptExecuted(_)
| cargo_metadata::Message::BuildFinished(_)
| cargo_metadata::Message::TextLine(_)
| _ => {}
},
}
}
@ -261,7 +257,7 @@ struct CargoHandle {
child: JodChild,
#[allow(unused)]
thread: jod_thread::JoinHandle<io::Result<bool>>,
receiver: Receiver<cargo_metadata::Message>,
receiver: Receiver<CargoMessage>,
}
impl CargoHandle {
@ -294,14 +290,11 @@ impl CargoHandle {
struct CargoActor {
child_stdout: process::ChildStdout,
sender: Sender<cargo_metadata::Message>,
sender: Sender<CargoMessage>,
}
impl CargoActor {
fn new(
child_stdout: process::ChildStdout,
sender: Sender<cargo_metadata::Message>,
) -> CargoActor {
fn new(child_stdout: process::ChildStdout, sender: Sender<CargoMessage>) -> CargoActor {
CargoActor { child_stdout, sender }
}
fn run(self) -> io::Result<bool> {
@ -315,7 +308,7 @@ impl CargoActor {
// erroneus output.
let stdout = BufReader::new(self.child_stdout);
let mut read_at_least_one_message = false;
for message in cargo_metadata::Message::parse_stream(stdout) {
for message in stdout.lines() {
let message = match message {
Ok(message) => message,
Err(err) => {
@ -326,13 +319,43 @@ impl CargoActor {
read_at_least_one_message = true;
// Skip certain kinds of messages to only spend time on what's useful
match &message {
cargo_metadata::Message::CompilerArtifact(artifact) if artifact.fresh => (),
cargo_metadata::Message::BuildScriptExecuted(_) => (),
_ => self.sender.send(message).unwrap(),
// Try to deserialize a message from Cargo.
{
let mut deserializer = serde_json::Deserializer::from_str(&message);
deserializer.disable_recursion_limit();
if let Ok(message) = cargo_metadata::Message::deserialize(&mut deserializer) {
// Skip certain kinds of messages to only spend time on what's useful
match message {
cargo_metadata::Message::CompilerArtifact(artifact) if !artifact.fresh => {
self.sender.send(CargoMessage::CompilerArtifact(artifact)).unwrap()
}
cargo_metadata::Message::CompilerMessage(msg) => {
self.sender.send(CargoMessage::Diagnostic(msg.message)).unwrap()
}
cargo_metadata::Message::CompilerArtifact(_)
| cargo_metadata::Message::BuildScriptExecuted(_)
| cargo_metadata::Message::BuildFinished(_)
| cargo_metadata::Message::TextLine(_)
| _ => (),
}
}
}
// Try to deserialize a Diagnostic directly from Rustc.
{
let mut deserializer = serde_json::Deserializer::from_str(&message);
deserializer.disable_recursion_limit();
if let Ok(message) = Diagnostic::deserialize(&mut deserializer) {
self.sender.send(CargoMessage::Diagnostic(message)).unwrap()
}
}
}
Ok(read_at_least_one_message)
}
}
enum CargoMessage {
CompilerArtifact(cargo_metadata::Artifact),
Diagnostic(Diagnostic),
}