Skip to content

Commit

Permalink
Use extend instead of pushing in a loop
Browse files Browse the repository at this point in the history
  • Loading branch information
notriddle committed Mar 3, 2022
1 parent 72873d8 commit d8c0822
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions src/cargo/core/compiler/fingerprint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1568,13 +1568,14 @@ fn local_fingerprints_deps(
local.push(LocalFingerprint::RerunIfChanged { output, paths });
}

for var in deps.rerun_if_env_changed.iter() {
let val = env::var(var).ok();
local.push(LocalFingerprint::RerunIfEnvChanged {
var: var.clone(),
val,
});
}
local.extend(
deps.rerun_if_env_changed
.iter()
.map(|var| LocalFingerprint::RerunIfEnvChanged {
var: var.clone(),
val: env::var(var).ok(),
}),
);

local
}
Expand Down Expand Up @@ -1697,14 +1698,13 @@ pub fn parse_dep_info(
};
let mut ret = RustcDepInfo::default();
ret.env = info.env;
for (ty, path) in info.files {
let path = match ty {
ret.files.extend(info.files.into_iter().map(|(ty, path)| {
match ty {
DepInfoPathType::PackageRootRelative => pkg_root.join(path),
// N.B. path might be absolute here in which case the join will have no effect
DepInfoPathType::TargetRootRelative => target_root.join(path),
};
ret.files.push(path);
}
}
}));
Ok(Some(ret))
}

Expand Down

0 comments on commit d8c0822

Please sign in to comment.