Skip to content

Commit c82fd7f

Browse files
borsbors
committed
Auto merge of #3310 - alexcrichton:more-metadata-hashing, r=brson
Apply new fingerprinting to build dir outputs We now much more aggressively cache the output of the compiler based on feature sets and profile configuration. Unfortunately we forgot to extend this caching to build script output directories as well so this commit ensures that build script outputs are cached the same way with a directory per configuration of features and output settings. Closes #3302
2 parents 33d20b4 + 41579ba commit c82fd7f

13 files changed

+217
-263
lines changed

‎src/cargo/core/manifest.rs

+7-20
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use rustc_serialize::{Encoder, Encodable};
66

77
use core::{Dependency, PackageId, Summary, SourceId, PackageIdSpec};
88
use core::WorkspaceConfig;
9-
use core::package_id::Metadata;
109

1110
pub enum EitherManifest {
1211
Real(Manifest),
@@ -159,7 +158,6 @@ pub struct Target {
159158
kind: TargetKind,
160159
name: String,
161160
src_path: PathBuf,
162-
metadata: Option<Metadata>,
163161
tested: bool,
164162
benched: bool,
165163
doc: bool,
@@ -279,7 +277,6 @@ impl Target {
279277
kind: TargetKind::Bin,
280278
name: String::new(),
281279
src_path: PathBuf::new(),
282-
metadata: None,
283280
doc: false,
284281
doctest: false,
285282
harness: true,
@@ -289,40 +286,35 @@ impl Target {
289286
}
290287
}
291288

292-
pub fn lib_target(name: &str, crate_targets: Vec<LibKind>,
293-
src_path: &Path,
294-
metadata: Metadata) -> Target {
289+
pub fn lib_target(name: &str,
290+
crate_targets: Vec<LibKind>,
291+
src_path: &Path) -> Target {
295292
Target {
296293
kind: TargetKind::Lib(crate_targets),
297294
name: name.to_string(),
298295
src_path: src_path.to_path_buf(),
299-
metadata: Some(metadata),
300296
doctest: true,
301297
doc: true,
302298
..Target::blank()
303299
}
304300
}
305301

306-
pub fn bin_target(name: &str, src_path: &Path,
307-
metadata: Option<Metadata>) -> Target {
302+
pub fn bin_target(name: &str, src_path: &Path) -> Target {
308303
Target {
309304
kind: TargetKind::Bin,
310305
name: name.to_string(),
311306
src_path: src_path.to_path_buf(),
312-
metadata: metadata,
313307
doc: true,
314308
..Target::blank()
315309
}
316310
}
317311

318312
/// Builds a `Target` corresponding to the `build = "build.rs"` entry.
319-
pub fn custom_build_target(name: &str, src_path: &Path,
320-
metadata: Option<Metadata>) -> Target {
313+
pub fn custom_build_target(name: &str, src_path: &Path) -> Target {
321314
Target {
322315
kind: TargetKind::CustomBuild,
323316
name: name.to_string(),
324317
src_path: src_path.to_path_buf(),
325-
metadata: metadata,
326318
for_host: true,
327319
benched: false,
328320
tested: false,
@@ -340,25 +332,21 @@ impl Target {
340332
}
341333
}
342334

343-
pub fn test_target(name: &str, src_path: &Path,
344-
metadata: Metadata) -> Target {
335+
pub fn test_target(name: &str, src_path: &Path) -> Target {
345336
Target {
346337
kind: TargetKind::Test,
347338
name: name.to_string(),
348339
src_path: src_path.to_path_buf(),
349-
metadata: Some(metadata),
350340
benched: false,
351341
..Target::blank()
352342
}
353343
}
354344

355-
pub fn bench_target(name: &str, src_path: &Path,
356-
metadata: Metadata) -> Target {
345+
pub fn bench_target(name: &str, src_path: &Path) -> Target {
357346
Target {
358347
kind: TargetKind::Bench,
359348
name: name.to_string(),
360349
src_path: src_path.to_path_buf(),
361-
metadata: Some(metadata),
362350
tested: false,
363351
..Target::blank()
364352
}
@@ -367,7 +355,6 @@ impl Target {
367355
pub fn name(&self) -> &str { &self.name }
368356
pub fn crate_name(&self) -> String { self.name.replace("-", "_") }
369357
pub fn src_path(&self) -> &Path { &self.src_path }
370-
pub fn metadata(&self) -> Option<&Metadata> { self.metadata.as_ref() }
371358
pub fn kind(&self) -> &TargetKind { &self.kind }
372359
pub fn tested(&self) -> bool { self.tested }
373360
pub fn harness(&self) -> bool { self.harness }

‎src/cargo/core/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pub use self::dependency::{Dependency, DependencyInner};
22
pub use self::manifest::{Manifest, Target, TargetKind, Profile, LibKind, Profiles};
33
pub use self::manifest::{EitherManifest, VirtualManifest};
44
pub use self::package::{Package, PackageSet};
5-
pub use self::package_id::{PackageId, Metadata};
5+
pub use self::package_id::PackageId;
66
pub use self::package_id_spec::PackageIdSpec;
77
pub use self::registry::Registry;
88
pub use self::resolver::Resolve;

‎src/cargo/core/package.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::path::{Path, PathBuf};
77
use semver::Version;
88

99
use core::{Dependency, Manifest, PackageId, SourceId, Target, TargetKind};
10-
use core::{Summary, Metadata, SourceMap};
10+
use core::{Summary, SourceMap};
1111
use ops;
1212
use util::{CargoResult, Config, LazyCell, ChainError, internal, human, lev_distance};
1313
use rustc_serialize::{Encoder,Encodable};
@@ -94,10 +94,6 @@ impl Package {
9494
self.targets().iter().any(|t| t.is_custom_build())
9595
}
9696

97-
pub fn generate_metadata(&self) -> Metadata {
98-
self.package_id().generate_metadata()
99-
}
100-
10197
pub fn find_closest_target(&self, target: &str, kind: TargetKind) -> Option<&Target> {
10298
let targets = self.targets();
10399

‎src/cargo/core/package_id.rs

+1-22
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use regex::Regex;
99
use rustc_serialize::{Encodable, Encoder, Decodable, Decoder};
1010
use semver;
1111

12-
use util::{CargoResult, CargoError, short_hash, ToSemver};
12+
use util::{CargoResult, CargoError, ToSemver};
1313
use core::source::SourceId;
1414

1515
/// Identifier for a specific version of a package in a specific source.
@@ -118,12 +118,6 @@ impl From<PackageIdError> for Box<CargoError> {
118118
fn from(t: PackageIdError) -> Box<CargoError> { Box::new(t) }
119119
}
120120

121-
#[derive(PartialEq, Eq, Hash, Clone, RustcEncodable, Debug)]
122-
pub struct Metadata {
123-
pub metadata: String,
124-
pub extra_filename: String
125-
}
126-
127121
impl PackageId {
128122
pub fn new<T: ToSemver>(name: &str, version: T,
129123
sid: &SourceId) -> CargoResult<PackageId> {
@@ -141,13 +135,6 @@ impl PackageId {
141135
pub fn version(&self) -> &semver::Version { &self.inner.version }
142136
pub fn source_id(&self) -> &SourceId { &self.inner.source_id }
143137

144-
pub fn generate_metadata(&self) -> Metadata {
145-
let metadata = short_hash(self);
146-
let extra_filename = format!("-{}", metadata);
147-
148-
Metadata { metadata: metadata, extra_filename: extra_filename }
149-
}
150-
151138
pub fn with_precise(&self, precise: Option<String>) -> PackageId {
152139
PackageId {
153140
inner: Arc::new(PackageIdInner {
@@ -169,14 +156,6 @@ impl PackageId {
169156
}
170157
}
171158

172-
impl Metadata {
173-
pub fn mix<T: Hash>(&mut self, t: &T) {
174-
let new_metadata = short_hash(&(&self.metadata, t));
175-
self.extra_filename = format!("-{}", new_metadata);
176-
self.metadata = new_metadata;
177-
}
178-
}
179-
180159
impl fmt::Display for PackageId {
181160
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
182161
write!(f, "{} v{}", self.inner.name, self.inner.version)?;

‎src/cargo/ops/cargo_clean.rs

+10-4
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,17 @@ pub fn clean(ws: &Workspace, opts: &CleanOptions) -> CargoResult<()> {
7373
cx.probe_target_info(&units)?;
7474

7575
for unit in units.iter() {
76-
let layout = cx.layout(unit);
77-
rm_rf(&layout.proxy().fingerprint(&unit.pkg))?;
78-
rm_rf(&layout.build(&unit.pkg))?;
76+
rm_rf(&cx.fingerprint_dir(unit))?;
77+
if unit.target.is_custom_build() {
78+
if unit.profile.run_custom_build {
79+
rm_rf(&cx.build_script_out_dir(unit))?;
80+
} else {
81+
rm_rf(&cx.build_script_dir(unit))?;
82+
}
83+
continue
84+
}
7985

80-
for (src, link_dst, _) in cx.target_filenames(&unit)? {
86+
for (src, link_dst, _) in cx.target_filenames(unit)? {
8187
rm_rf(&src)?;
8288
if let Some(dst) = link_dst {
8389
rm_rf(&dst)?;

0 commit comments

Comments
 (0)