Skip to content

Rework rustc output file tracking. #8210

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

Merged
bors merged 5 commits into from
May 7, 2020
Merged

Rework rustc output file tracking. #8210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a06be1
Add CrateType to replace LibKind.
ehuss Apr 26, 2020
eac3b66
Rework how Cargo computes the rustc file outputs.
ehuss May 5, 2020
a8997cb
Implement new `clean -p` using globs.
ehuss May 5, 2020
bd5f563
clean -p: call `get_many` once.
ehuss May 6, 2020
7438770
Revert always computing filename Metadata.
ehuss May 6, 2020
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
2 changes: 1 addition & 1 deletion src/cargo/core/compiler/build_context/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::collections::HashMap;
use std::path::PathBuf;

mod target_info;
pub use self::target_info::{FileFlavor, RustcTargetData, TargetInfo};
pub use self::target_info::{FileFlavor, FileType, RustcTargetData, TargetInfo};

/// The build context, containing all information about a build task.
///
Expand Down
275 changes: 207 additions & 68 deletions src/cargo/core/compiler/build_context/target_info.rs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/cargo/core/compiler/compilation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ impl<'cfg> Compilation<'cfg> {
}

for crate_type in unit.target.rustc_crate_types() {
p.arg("--crate-type").arg(crate_type);
p.arg("--crate-type").arg(crate_type.as_str());
}

Ok(p)
Expand Down
Loading