mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #14111 - lnicola:squash-proc-macro-server-warning, r=Veykril

Browse Source 
fix: Hide proc macro server version detection errors

These are harmless, but users tend to blame other things on them.
This commit is contained in:
bors 2023-02-09 10:29:28 +00:00
commit 7e17b98d17
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/proc-macro-api/src/process.rs
View File

@ -27,13 +27,13 @@ pub(crate) fn run(
process_path: AbsPathBuf, process_path: AbsPathBuf,
args: impl IntoIterator<Item = impl AsRef<OsStr>> + Clone, args: impl IntoIterator<Item = impl AsRef<OsStr>> + Clone,
) -> io::Result<ProcMacroProcessSrv> { ) -> io::Result<ProcMacroProcessSrv> {
let create_srv = || { let create_srv = |null_stderr| {
let mut process = Process::run(process_path.clone(), args.clone())?; let mut process = Process::run(process_path.clone(), args.clone(), null_stderr)?;
let (stdin, stdout) = process.stdio().expect("couldn't access child stdio"); let (stdin, stdout) = process.stdio().expect("couldn't access child stdio");
io::Result::Ok(ProcMacroProcessSrv { _process: process, stdin, stdout, version: 0 }) io::Result::Ok(ProcMacroProcessSrv { _process: process, stdin, stdout, version: 0 })
}; };
let mut srv = create_srv()?; let mut srv = create_srv(true)?;
tracing::info!("sending version check"); tracing::info!("sending version check");
match srv.version_check() { match srv.version_check() {
Ok(v) if v > CURRENT_API_VERSION => Err(io::Error::new( Ok(v) if v > CURRENT_API_VERSION => Err(io::Error::new(
@ -45,12 +45,13 @@ pub(crate) fn run(
)), )),
Ok(v) => { Ok(v) => {
tracing::info!("got version {v}"); tracing::info!("got version {v}");
srv = create_srv(false)?;
srv.version = v; srv.version = v;
Ok(srv) Ok(srv)
} }
Err(e) => { Err(e) => {
tracing::info!(%e, "proc-macro version check failed, restarting and assuming version 0"); tracing::info!(%e, "proc-macro version check failed, restarting and assuming version 0");
create_srv() create_srv(false)
} }
} }
} }
@ -98,9 +99,10 @@ impl Process {
fn run( fn run(
path: AbsPathBuf, path: AbsPathBuf,
args: impl IntoIterator<Item = impl AsRef<OsStr>>, args: impl IntoIterator<Item = impl AsRef<OsStr>>,
null_stderr: bool,
) -> io::Result<Process> { ) -> io::Result<Process> {
let args: Vec<OsString> = args.into_iter().map(|s| s.as_ref().into()).collect(); let args: Vec<OsString> = args.into_iter().map(|s| s.as_ref().into()).collect();
let child = JodChild(mk_child(&path, args)?); let child = JodChild(mk_child(&path, args, null_stderr)?);
Ok(Process { child }) Ok(Process { child })
} }
@ -116,13 +118,14 @@ fn stdio(&mut self) -> Option<(ChildStdin, BufReader<ChildStdout>)> {
fn mk_child( fn mk_child(
path: &AbsPath, path: &AbsPath,
args: impl IntoIterator<Item = impl AsRef<OsStr>>, args: impl IntoIterator<Item = impl AsRef<OsStr>>,
null_stderr: bool,
) -> io::Result<Child> { ) -> io::Result<Child> {
Command::new(path.as_os_str()) Command::new(path.as_os_str())
.args(args) .args(args)
.env("RUST_ANALYZER_INTERNALS_DO_NOT_USE", "this is unstable") .env("RUST_ANALYZER_INTERNALS_DO_NOT_USE", "this is unstable")
.stdin(Stdio::piped()) .stdin(Stdio::piped())
.stdout(Stdio::piped()) .stdout(Stdio::piped())
.stderr(Stdio::inherit()) .stderr(if null_stderr { Stdio::null() } else { Stdio::inherit() })
.spawn() .spawn()
} }