bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Address comments by reviewers.

Browse source
This commit is contained in:
Michael Woerister 2016-08-09 15:28:24 -04:00
parent 65eb024542
commit a7de0bc4c6
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/librustc/session/config.rs
View file

@ -258,13 +258,11 @@ top_level_options!(
lint_cap: Option<lint::Level> [TRACKED], lint_cap: Option<lint::Level> [TRACKED],
describe_lints: bool [UNTRACKED], describe_lints: bool [UNTRACKED],
output_types: OutputTypes [TRACKED], output_types: OutputTypes [TRACKED],
// FIXME(mw): I'm not entirely sure if this can have any influence on // FIXME(mw): We track this for now but it actually doesn't make too
// incremental compilation apart from what is already handled // much sense: The search path can stay the same while the
// by crate metadata hashes. Better track it. // things discovered there might have changed on disk.
search_paths: SearchPaths [TRACKED], search_paths: SearchPaths [TRACKED],
// FIXME(mw): Might not need to do dep-tracking for `libs`?
libs: Vec<(String, cstore::NativeLibraryKind)> [TRACKED], libs: Vec<(String, cstore::NativeLibraryKind)> [TRACKED],
// FIXME(mw): Might not need to do dep-tracking for `maybe_sysroot`?
maybe_sysroot: Option<PathBuf> [TRACKED], maybe_sysroot: Option<PathBuf> [TRACKED],
target_triple: String [TRACKED], target_triple: String [TRACKED],
@ -280,8 +278,9 @@ top_level_options!(
debugging_opts: DebuggingOptions [TRACKED], debugging_opts: DebuggingOptions [TRACKED],
prints: Vec<PrintRequest> [UNTRACKED], prints: Vec<PrintRequest> [UNTRACKED],
cg: CodegenOptions [TRACKED], cg: CodegenOptions [TRACKED],
// FIXME(mw): `externs` might not need to be tracked but let's err on // FIXME(mw): We track this for now but it actually doesn't make too
// the side of caution for now. // much sense: The value of this option can stay the same
// while the files they refer to might have changed on disk.
externs: Externs [TRACKED], externs: Externs [TRACKED],
crate_name: Option<String> [TRACKED], crate_name: Option<String> [TRACKED],
// An optional name to use as the crate for std during std injection, // An optional name to use as the crate for std during std injection,
@ -1719,11 +1718,12 @@ mod dep_tracking {
($t:ty) => ( ($t:ty) => (
impl DepTrackingHash for Vec<$t> { impl DepTrackingHash for Vec<$t> {
fn hash(&self, hasher: &mut SipHasher, error_format: ErrorOutputType) { fn hash(&self, hasher: &mut SipHasher, error_format: ErrorOutputType) {
let mut elems = self.clone(); let mut elems: Vec<&$t> = self.iter().collect();
elems.sort(); elems.sort();
for (i, e) in elems.iter().enumerate() { Hash::hash(&elems.len(), hasher);
Hash::hash(&i, hasher); for (index, elem) in elems.iter().enumerate() {
DepTrackingHash::hash(e, hasher, error_format); Hash::hash(&index, hasher);
DepTrackingHash::hash(*elem, hasher, error_format);
} }
} }
} }