nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-24 15:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Using error instead of output.stderr in failure mode.

Browse Source
This commit is contained in:
Cadu 2022-04-05 11:17:39 -03:00
parent ca9718aa42
commit 84cf6ad091
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/flycheck/src/lib.rs
View File

@ -2,7 +2,7 @@
//! another compatible command (f.x. clippy) in a background thread and provide //! another compatible command (f.x. clippy) in a background thread and provide
//! LSP diagnostics based on the output of the command. //! LSP diagnostics based on the output of the command.
use std::{fmt, io, process::Command, time::Duration, str::from_utf8}; use std::{fmt, io, process::Command, time::Duration};
use crossbeam_channel::{never, select, unbounded, Receiver, Sender}; use crossbeam_channel::{never, select, unbounded, Receiver, Sender};
use paths::AbsPathBuf; use paths::AbsPathBuf;
@ -330,7 +330,7 @@ impl CargoActor {
Ok(output) => { Ok(output) => {
Err(io::Error::new(io::ErrorKind::Other, format!( Err(io::Error::new(io::ErrorKind::Other, format!(
"Cargo watcher failed, the command produced no valid metadata (exit code: {:?})\nCargo's stderr output:\n{}", "Cargo watcher failed, the command produced no valid metadata (exit code: {:?})\nCargo's stderr output:\n{}",
output.status, from_utf8(&output.stderr).unwrap_or("(Error: Could not fetch Cargo's stderr output)") output.status, error
))) )))
} }
Err(e) => Err(io::Error::new(e.kind(), format!("{:?}: {}", e, error))), Err(e) => Err(io::Error::new(e.kind(), format!("{:?}: {}", e, error))),