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

Don't crash on empty out_dirs with older cargos

Browse source 
closes #5125
This commit is contained in:
Aleksey Kladov 2020-06-30 22:12:27 +02:00
parent bad0b9aa23
commit cec92407f4
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/ra_project_model/src/cargo_workspace.rs
View file

@ -1,6 +1,11 @@
//! FIXME: write short doc here //! FIXME: write short doc here
use std::{ffi::OsStr, ops, path::Path, process::Command}; use std::{
ffi::OsStr,
ops,
path::{Path, PathBuf},
process::Command,
};
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId}; use cargo_metadata::{BuildScript, CargoOpt, Message, MetadataCommand, PackageId};
@ -308,9 +313,13 @@ pub fn load_extern_resources(
if let Ok(message) = message { if let Ok(message) = message {
match message { match message {
Message::BuildScriptExecuted(BuildScript { package_id, out_dir, cfgs, .. }) => { Message::BuildScriptExecuted(BuildScript { package_id, out_dir, cfgs, .. }) => {
let out_dir = AbsPathBuf::assert(out_dir); // cargo_metadata crate returns default (empty) path for
res.out_dirs.insert(package_id.clone(), out_dir); // older cargos, which is not absolute, so work around that.
res.cfgs.insert(package_id, cfgs); if out_dir != PathBuf::default() {
let out_dir = AbsPathBuf::assert(out_dir);
res.out_dirs.insert(package_id.clone(), out_dir);
res.cfgs.insert(package_id, cfgs);
}
} }
Message::CompilerArtifact(message) => { Message::CompilerArtifact(message) => {
if message.target.kind.contains(&"proc-macro".to_string()) { if message.target.kind.contains(&"proc-macro".to_string()) {