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

Merge #5152

Browse Source 
5152: Don't crash on empty out_dirs with older cargos r=matklad a=matklad

closes #5125



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-06-30 20:15:37 +00:00 committed by GitHub
commit c78180c318
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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()) {