Skip to content

Commit 88ab8ed

Browse files
borsbors
committed
Auto merge of #5359 - matklad:rustc-cache, r=<try>
Rustc cache This implements rustc caching, to speed-up no-op builds. The cache is per-project, and stored in `target` directory. To implement this, I had to move `rustc` from `Config` down to `BuildConfig`. closes #5315
2 parents 74e658c + 42f347a commit 88ab8ed

19 files changed

+436
-94
lines changed

‎src/bin/cli.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Run with 'cargo -Z [FLAG] [SUBCOMMAND]'"
4747
}
4848

4949
if let Some(ref code) = args.value_of("explain") {
50-
let mut procss = config.rustc()?.process();
50+
let mut procss = config.rustc(None)?.process();
5151
procss.arg("--explain").arg(code).exec()?;
5252
return Ok(());
5353
}

‎src/cargo/core/compiler/compilation.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,17 @@ pub struct Compilation<'cfg> {
5757
/// Flags to pass to rustdoc when invoked from cargo test, per package.
5858
pub rustdocflags: HashMap<PackageId, Vec<String>>,
5959

60+
pub host: String,
6061
pub target: String,
6162

6263
config: &'cfg Config,
64+
rustc_process: ProcessBuilder,
6365

6466
target_runner: LazyCell<Option<(PathBuf, Vec<String>)>>,
6567
}
6668

6769
impl<'cfg> Compilation<'cfg> {
68-
pub fn new(config: &'cfg Config) -> Compilation<'cfg> {
70+
pub fn new(config: &'cfg Config, rustc_process: ProcessBuilder) -> Compilation<'cfg> {
6971
Compilation {
7072
libraries: HashMap::new(),
7173
native_dirs: BTreeSet::new(), // TODO: deprecated, remove
@@ -81,14 +83,16 @@ impl<'cfg> Compilation<'cfg> {
8183
cfgs: HashMap::new(),
8284
rustdocflags: HashMap::new(),
8385
config,
86+
rustc_process,
87+
host: String::new(),
8488
target: String::new(),
8589
target_runner: LazyCell::new(),
8690
}
8791
}
8892

8993
/// See `process`.
9094
pub fn rustc_process(&self, pkg: &Package) -> CargoResult<ProcessBuilder> {
91-
self.fill_env(self.config.rustc()?.process(), pkg, true)
95+
self.fill_env(self.rustc_process.clone(), pkg, true)
9296
}
9397

9498
/// See `process`.

‎src/cargo/core/compiler/context/compilation_files.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,7 @@ fn compute_metadata<'a, 'cfg>(
434434
unit.target.name().hash(&mut hasher);
435435
unit.target.kind().hash(&mut hasher);
436436

437-
if let Ok(rustc) = cx.config.rustc() {
438-
rustc.verbose_version.hash(&mut hasher);
439-
}
437+
cx.build_config.rustc.verbose_version.hash(&mut hasher);
440438

441439
// Seed the contents of __CARGO_DEFAULT_LIB_METADATA to the hasher if present.
442440
// This should be the release channel, to get a different hash for each channel.

‎src/cargo/core/compiler/context/mod.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
130130
let _p = profile::start("Context::probe_target_info");
131131
debug!("probe_target_info");
132132
let host_target_same = match build_config.requested_target {
133-
Some(ref s) if s != &config.rustc()?.host => false,
133+
Some(ref s) if s != &build_config.host_triple() => false,
134134
_ => true,
135135
};
136136

@@ -150,7 +150,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
150150
config,
151151
target_info,
152152
host_info,
153-
compilation: Compilation::new(config),
153+
compilation: Compilation::new(config, build_config.rustc.process()),
154154
build_state: Arc::new(BuildState::new(&build_config)),
155155
build_config,
156156
fingerprints: HashMap::new(),
@@ -302,6 +302,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
302302
self.compilation.native_dirs.insert(dir.clone());
303303
}
304304
}
305+
self.compilation.host = self.build_config.host_triple().to_string();
305306
self.compilation.target = self.build_config.target_triple().to_string();
306307
Ok(self.compilation)
307308
}
@@ -440,7 +441,7 @@ impl<'a, 'cfg> Context<'a, 'cfg> {
440441
None => return true,
441442
};
442443
let (name, info) = match kind {
443-
Kind::Host => (self.build_config.host_triple.as_ref(), &self.host_info),
444+
Kind::Host => (self.build_config.host_triple(), &self.host_info),
444445
Kind::Target => (self.build_config.target_triple(), &self.target_info),
445446
};
446447
platform.matches(name, info.cfg())
@@ -652,7 +653,8 @@ fn env_args(
652653
let target = build_config
653654
.requested_target
654655
.as_ref()
655-
.unwrap_or(&build_config.host_triple);
656+
.map(|s| s.as_str())
657+
.unwrap_or(build_config.host_triple());
656658
let key = format!("target.{}.{}", target, name);
657659
if let Some(args) = config.get_list_or_split_string(&key)? {
658660
let args = args.val.into_iter();

‎src/cargo/core/compiler/context/target_info.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ impl FileType {
5353
impl TargetInfo {
5454
pub fn new(config: &Config, build_config: &BuildConfig, kind: Kind) -> CargoResult<TargetInfo> {
5555
let rustflags = env_args(config, build_config, None, kind, "RUSTFLAGS")?;
56-
let mut process = config.rustc()?.process();
56+
let mut process = build_config.rustc.process();
5757
process
5858
.arg("-")
5959
.arg("--crate-name")
@@ -78,20 +78,19 @@ impl TargetInfo {
7878
with_cfg.arg("--print=cfg");
7979

8080
let mut has_cfg_and_sysroot = true;
81-
let output = with_cfg
82-
.exec_with_output()
81+
let (output, error) = build_config
82+
.rustc
83+
.cached_output(&with_cfg)
8384
.or_else(|_| {
8485
has_cfg_and_sysroot = false;
85-
process.exec_with_output()
86+
build_config.rustc.cached_output(&process)
8687
})
8788
.chain_err(|| "failed to run `rustc` to learn about target-specific information")?;
8889

89-
let error = str::from_utf8(&output.stderr).unwrap();
90-
let output = str::from_utf8(&output.stdout).unwrap();
9190
let mut lines = output.lines();
9291
let mut map = HashMap::new();
9392
for crate_type in KNOWN_CRATE_TYPES {
94-
let out = parse_crate_type(crate_type, error, &mut lines)?;
93+
let out = parse_crate_type(crate_type, &error, &mut lines)?;
9594
map.insert(crate_type.to_string(), out);
9695
}
9796

‎src/cargo/core/compiler/custom_build.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ fn build_work<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoRes
127127
.env(
128128
"TARGET",
129129
&match unit.kind {
130-
Kind::Host => &cx.build_config.host_triple,
130+
Kind::Host => &cx.build_config.host_triple(),
131131
Kind::Target => cx.build_config.target_triple(),
132132
},
133133
)
@@ -141,8 +141,8 @@ fn build_work<'a, 'cfg>(cx: &mut Context<'a, 'cfg>, unit: &Unit<'a>) -> CargoRes
141141
"debug"
142142
},
143143
)
144-
.env("HOST", &cx.build_config.host_triple)
145-
.env("RUSTC", &cx.config.rustc()?.path)
144+
.env("HOST", &cx.build_config.host_triple())
145+
.env("RUSTC", &cx.build_config.rustc.path)
146146
.env("RUSTDOC", &*cx.config.rustdoc()?)
147147
.inherit_jobserver(&cx.jobserver);
148148

‎src/cargo/core/compiler/fingerprint.rs

+6-10
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,7 @@ impl Fingerprint {
220220
match *local {
221221
LocalFingerprint::MtimeBased(ref slot, ref path) => {
222222
let path = root.join(path);
223-
let meta = fs::metadata(&path)
224-
.chain_err(|| internal(format!("failed to stat `{}`", path.display())))?;
225-
let mtime = FileTime::from_last_modification_time(&meta);
223+
let mtime = paths::mtime(&path)?;
226224
*slot.0.lock().unwrap() = Some(mtime);
227225
}
228226
LocalFingerprint::EnvBased(..) | LocalFingerprint::Precalculated(..) => continue,
@@ -457,7 +455,7 @@ fn calculate<'a, 'cfg>(
457455
cx.rustflags_args(unit)?
458456
};
459457
let fingerprint = Arc::new(Fingerprint {
460-
rustc: util::hash_u64(&cx.config.rustc()?.verbose_version),
458+
rustc: util::hash_u64(&cx.build_config.rustc.verbose_version),
461459
target: util::hash_u64(&unit.target),
462460
profile: util::hash_u64(&(&unit.profile, cx.incremental_args(unit)?)),
463461
// Note that .0 is hashed here, not .1 which is the cwd. That doesn't
@@ -718,22 +716,20 @@ where
718716
I: IntoIterator,
719717
I::Item: AsRef<Path>,
720718
{
721-
let meta = match fs::metadata(output) {
722-
Ok(meta) => meta,
719+
let mtime = match paths::mtime(output) {
720+
Ok(mtime) => mtime,
723721
Err(..) => return None,
724722
};
725-
let mtime = FileTime::from_last_modification_time(&meta);
726723

727724
let any_stale = paths.into_iter().any(|path| {
728725
let path = path.as_ref();
729-
let meta = match fs::metadata(path) {
730-
Ok(meta) => meta,
726+
let mtime2 = match paths::mtime(path) {
727+
Ok(mtime) => mtime,
731728
Err(..) => {
732729
info!("stale: {} -- missing", path.display());
733730
return true;
734731
}
735732
};
736-
let mtime2 = FileTime::from_last_modification_time(&meta);
737733
if mtime2 > mtime {
738734
info!("stale: {} -- {} vs {}", path.display(), mtime2, mtime);
739735
true

‎src/cargo/core/compiler/mod.rs

+22-16
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ use serde_json;
1212
use core::{Feature, PackageId, Profile, Target};
1313
use core::manifest::Lto;
1414
use core::shell::ColorChoice;
15-
use util::{self, machine_message, Config, ProcessBuilder};
15+
use util::{self, machine_message, Config, Freshness, ProcessBuilder, Rustc};
1616
use util::{internal, join_paths, profile};
1717
use util::paths;
1818
use util::errors::{CargoResult, CargoResultExt, Internal};
19-
use util::Freshness;
2019

2120
use self::job::{Job, Work};
2221
use self::job_queue::JobQueue;
@@ -48,15 +47,8 @@ pub enum Kind {
4847
}
4948

5049
/// Configuration information for a rustc build.
51-
#[derive(Default, Clone)]
5250
pub struct BuildConfig {
53-
/// The host arch triple
54-
///
55-
/// e.g. x86_64-unknown-linux-gnu, would be
56-
/// - machine: x86_64
57-
/// - hardware-platform: unknown
58-
/// - operating system: linux-gnu
59-
pub host_triple: String,
51+
pub rustc: Rustc,
6052
/// Build information for the host arch
6153
pub host: TargetConfig,
6254
/// The target arch triple, defaults to host arch
@@ -88,6 +80,7 @@ impl BuildConfig {
8880
config: &Config,
8981
jobs: Option<u32>,
9082
requested_target: &Option<String>,
83+
rustc_info_cache: Option<PathBuf>,
9184
) -> CargoResult<BuildConfig> {
9285
if let &Some(ref s) = requested_target {
9386
if s.trim().is_empty() {
@@ -125,27 +118,40 @@ impl BuildConfig {
125118
None => None,
126119
};
127120
let jobs = jobs.or(cfg_jobs).unwrap_or(::num_cpus::get() as u32);
128-
129-
let host_triple = config.rustc()?.host.clone();
130-
let host_config = TargetConfig::new(config, &host_triple)?;
121+
let rustc = config.rustc(rustc_info_cache)?;
122+
let host_config = TargetConfig::new(config, &rustc.host)?;
131123
let target_config = match target.as_ref() {
132124
Some(triple) => TargetConfig::new(config, triple)?,
133125
None => host_config.clone(),
134126
};
135127
Ok(BuildConfig {
136-
host_triple,
128+
rustc,
137129
requested_target: target,
138130
jobs,
139131
host: host_config,
140132
target: target_config,
141-
..Default::default()
133+
release: false,
134+
test: false,
135+
doc_all: false,
136+
json_messages: false,
142137
})
143138
}
144139

140+
/// The host arch triple
141+
///
142+
/// e.g. x86_64-unknown-linux-gnu, would be
143+
/// - machine: x86_64
144+
/// - hardware-platform: unknown
145+
/// - operating system: linux-gnu
146+
pub fn host_triple(&self) -> &str {
147+
&self.rustc.host
148+
}
149+
145150
pub fn target_triple(&self) -> &str {
146151
self.requested_target
147152
.as_ref()
148-
.unwrap_or_else(|| &self.host_triple)
153+
.map(|s| s.as_str())
154+
.unwrap_or(self.host_triple())
149155
}
150156
}
151157

‎src/cargo/ops/cargo_clean.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ pub fn clean(ws: &Workspace, opts: &CleanOptions) -> CargoResult<()> {
8484
}
8585
}
8686

87-
let mut build_config = BuildConfig::new(config, Some(1), &opts.target)?;
87+
let mut build_config = BuildConfig::new(config, Some(1), &opts.target, None)?;
8888
build_config.release = opts.release;
8989
let mut cx = Context::new(ws, &resolve, &packages, opts.config, build_config, profiles)?;
9090
cx.prepare_units(None, &units)?;

‎src/cargo/ops/cargo_compile.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,8 @@ pub fn compile_ws<'a>(
260260
bail!("jobs must be at least 1")
261261
}
262262

263-
let mut build_config = BuildConfig::new(config, jobs, &target)?;
263+
let rustc_info_cache = ws.target_dir().join("rustc_info.json").into_path_unlocked();
264+
let mut build_config = BuildConfig::new(config, jobs, &target, Some(rustc_info_cache))?;
264265
build_config.release = release;
265266
build_config.test = mode == CompileMode::Test || mode == CompileMode::Bench;
266267
build_config.json_messages = message_format == MessageFormat::Json;

‎src/cargo/ops/cargo_test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ fn run_doc_tests(
150150
let config = options.compile_opts.config;
151151

152152
// We don't build/rust doctests if target != host
153-
if config.rustc()?.host != compilation.target {
153+
if compilation.host != compilation.target {
154154
return Ok((Test::Doc, errors));
155155
}
156156

‎src/cargo/sources/path.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use ignore::gitignore::GitignoreBuilder;
1111
use core::{Dependency, Package, PackageId, Registry, Source, SourceId, Summary};
1212
use ops;
1313
use util::{self, internal, CargoResult};
14+
use util::paths;
1415
use util::Config;
1516

1617
pub struct PathSource<'cfg> {
@@ -529,9 +530,7 @@ impl<'cfg> Source for PathSource<'cfg> {
529530
// condition where this path was rm'ed - either way,
530531
// we can ignore the error and treat the path's mtime
531532
// as 0.
532-
let mtime = fs::metadata(&file)
533-
.map(|meta| FileTime::from_last_modification_time(&meta))
534-
.unwrap_or(FileTime::zero());
533+
let mtime = paths::mtime(&file).unwrap_or(FileTime::zero());
535534
warn!("{} {}", mtime, file.display());
536535
if mtime > max {
537536
max = mtime;

0 commit comments

Comments
 (0)