Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tweak Layout to allow for non json file targets with internal "." #6255

Merged
merged 1 commit into from
Nov 25, 2018
Merged

Tweak Layout to allow for non json file targets with internal "." #6255

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/cargo/core/compiler/layout.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,20 @@ impl Layout {
/// adding the target triple and the profile (debug, release, ...).
pub fn new(ws: &Workspace, triple: Option<&str>, dest: &str) -> CargoResult<Layout> {
let mut path = ws.target_dir();
// Flexible target specifications often point at filenames, so interpret
// Flexible target specifications often point at json files, so interpret
// the target triple as a Path and then just use the file stem as the
// component for the directory name.
// component for the directory name in that case.
if let Some(triple) = triple {
path.push(Path::new(triple)
.file_stem()
.ok_or_else(|| format_err!("invalid target"))?);
let triple = Path::new(triple);
if triple.extension().and_then(|s| s.to_str()) == Some("json") {
path.push(
triple
.file_stem()
.ok_or_else(|| format_err!("invalid target"))?,
);
} else {
path.push(triple);
}
}
path.push(dest);
Layout::at(ws.config(), path)
Expand Down