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

internal: Don't log default build script outputs #12457

Merged
merged 1 commit into from Jun 3, 2022
Merged

internal: Don't log default build script outputs #12457

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 25 additions & 16 deletions crates/project-model/src/build_scripts.rs
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ use crate::{cfg_flag::CfgFlag, CargoConfig, CargoWorkspace, Package};

#[derive(Debug, Default, Clone, PartialEq, Eq)]
pub struct WorkspaceBuildScripts {
pub(crate) outputs: ArenaMap<Package, BuildScriptOutput>,
outputs: ArenaMap<Package, Option<BuildScriptOutput>>,
error: Option<String>,
}

Expand Down Expand Up @@ -72,6 +72,7 @@ impl WorkspaceBuildScripts {

cmd
}

pub(crate) fn run(
config: &CargoConfig,
workspace: &CargoWorkspace,
Expand All @@ -91,13 +92,13 @@ impl WorkspaceBuildScripts {
cmd.current_dir(workspace.workspace_root());

let mut res = WorkspaceBuildScripts::default();
let outputs = &mut res.outputs;
// NB: Cargo.toml could have been modified between `cargo metadata` and
// `cargo check`. We shouldn't assume that package ids we see here are
// exactly those from `config`.
let mut by_id: FxHashMap<String, Package> = FxHashMap::default();

for package in workspace.packages() {
res.outputs.insert(package, BuildScriptOutput::default());
outputs.insert(package, None);
by_id.insert(workspace[package].id.clone(), package);
}

Expand Down Expand Up @@ -141,7 +142,8 @@ impl WorkspaceBuildScripts {
}
acc
};
let package_build_data = &mut res.outputs[package];
let package_build_data =
outputs[package].get_or_insert_with(Default::default);
// cargo_metadata crate returns default (empty) path for
// older cargos, which is not absolute, so work around that.
if !message.out_dir.as_str().is_empty() {
Expand All @@ -167,7 +169,9 @@ impl WorkspaceBuildScripts {
message.filenames.iter().find(|name| is_dylib(name))
{
let filename = AbsPathBuf::assert(PathBuf::from(&filename));
res.outputs[package].proc_macro_dylib_path = Some(filename);
outputs[package]
.get_or_insert_with(Default::default)
.proc_macro_dylib_path = Some(filename);
}
}
}
Expand All @@ -189,17 +193,18 @@ impl WorkspaceBuildScripts {
)?;

for package in workspace.packages() {
let package_build_data = &mut res.outputs[package];
tracing::info!(
"{} BuildScriptOutput: {:?}",
workspace[package].manifest.parent().display(),
package_build_data,
);
// inject_cargo_env(package, package_build_data);
if let Some(out_dir) = &package_build_data.out_dir {
// NOTE: cargo and rustc seem to hide non-UTF-8 strings from env! and option_env!()
if let Some(out_dir) = out_dir.as_os_str().to_str().map(|s| s.to_owned()) {
package_build_data.envs.push(("OUT_DIR".to_string(), out_dir));
if let Some(package_build_data) = &mut outputs[package] {
tracing::info!(
"{} BuildScriptOutput: {:?}",
workspace[package].manifest.parent().display(),
package_build_data,
);
// inject_cargo_env(package, package_build_data);
if let Some(out_dir) = &package_build_data.out_dir {
// NOTE: cargo and rustc seem to hide non-UTF-8 strings from env! and option_env!()
if let Some(out_dir) = out_dir.as_os_str().to_str().map(|s| s.to_owned()) {
package_build_data.envs.push(("OUT_DIR".to_string(), out_dir));
}
}
}
}
Expand All @@ -218,6 +223,10 @@ impl WorkspaceBuildScripts {
pub fn error(&self) -> Option<&str> {
self.error.as_deref()
}

pub(crate) fn get_output(&self, idx: Package) -> Option<&BuildScriptOutput> {
self.outputs.get(idx)?.as_ref()
}
}

// FIXME: File a better way to know if it is a dylib.
Expand Down
8 changes: 4 additions & 4 deletions crates/project-model/src/workspace.rs
View file
Open in desktop
Expand Up @@ -312,9 +312,9 @@ impl ProjectWorkspace {
let pkg_root = cargo[pkg].manifest.parent().to_path_buf();

let mut include = vec![pkg_root.clone()];
include.extend(
build_scripts.outputs.get(pkg).and_then(|it| it.out_dir.clone()),
);
let out_dir =
build_scripts.get_output(pkg).and_then(|it| it.out_dir.clone());
include.extend(out_dir);

// In case target's path is manually set in Cargo.toml to be
// outside the package root, add its parent as an extra include.
Expand Down Expand Up @@ -586,7 +586,7 @@ fn cargo_to_crate_graph(
let crate_id = add_target_crate_root(
&mut crate_graph,
&cargo[pkg],
build_scripts.outputs.get(pkg),
build_scripts.get_output(pkg),
cfg_options,
&mut |path| load_proc_macro(&cargo[tgt].name, path),
file_id,
Expand Down