itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused code

Browse Source
This commit is contained in:
Will Crichton 2021-10-12 13:19:58 -07:00
parent 70f38213da
commit d29ac156f2
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/cargo/core/compiler/context/mod.rs
View File

@ -206,19 +206,21 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
// If the unit has a build script, add `OUT_DIR` to the // If the unit has a build script, add `OUT_DIR` to the
// environment variables. // environment variables.
for dep in &self.bcx.unit_graph[unit] { if unit.target.is_lib() {
if dep.unit.mode.is_run_custom_build() { for dep in &self.bcx.unit_graph[unit] {
let out_dir = self if dep.unit.mode.is_run_custom_build() {
.files() let out_dir = self
.build_script_out_dir(&dep.unit) .files()
.display() .build_script_out_dir(&dep.unit)
.to_string(); .display()
let script_meta = self.get_run_build_script_metadata(&dep.unit); .to_string();
self.compilation let script_meta = self.get_run_build_script_metadata(&dep.unit);
.extra_env self.compilation
.entry(script_meta) .extra_env
.or_insert_with(Vec::new) .entry(script_meta)
.push(("OUT_DIR".to_string(), out_dir)); .or_insert_with(Vec::new)
.push(("OUT_DIR".to_string(), out_dir));
}
} }
} }

2
src/cargo/core/compiler/mod.rs
View File

@ -12,7 +12,7 @@ mod job;
mod job_queue; mod job_queue;
mod layout; mod layout;
mod links; mod links;
pub mod lto; mod lto;
mod output_depinfo; mod output_depinfo;
pub mod rustdoc; pub mod rustdoc;
pub mod standard_lib; pub mod standard_lib;

3
src/cargo/ops/cargo_compile.rs
View File

@ -25,13 +25,10 @@
use std::collections::{BTreeSet, HashMap, HashSet}; use std::collections::{BTreeSet, HashMap, HashSet};
use std::ffi::OsString; use std::ffi::OsString;
use std::hash::{Hash, Hasher}; use std::hash::{Hash, Hasher};
use std::iter;
use std::sync::Arc; use std::sync::Arc;
use crate::core::compiler::lto;
use crate::core::compiler::unit_dependencies::build_unit_dependencies; use crate::core::compiler::unit_dependencies::build_unit_dependencies;
use crate::core::compiler::unit_graph::{self, UnitDep, UnitGraph}; use crate::core::compiler::unit_graph::{self, UnitDep, UnitGraph};
use crate::core::compiler::Layout;
use crate::core::compiler::{standard_lib, TargetInfo}; use crate::core::compiler::{standard_lib, TargetInfo};
use crate::core::compiler::{BuildConfig, BuildContext, Compilation, Context}; use crate::core::compiler::{BuildConfig, BuildContext, Compilation, Context};
use crate::core::compiler::{CompileKind, CompileMode, CompileTarget, RustcTargetData, Unit}; use crate::core::compiler::{CompileKind, CompileMode, CompileTarget, RustcTargetData, Unit};