projects
/
cargo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
63281c7
)
Extract method for recording a requested dependency
author
Dirkjan Ochtman
<dirkjan@ochtman.nl>
Mon, 2 Oct 2017 15:59:41 +0000
(17:59 +0200)
committer
Dirkjan Ochtman
<dirkjan@ochtman.nl>
Mon, 30 Oct 2017 19:22:28 +0000
(20:22 +0100)
src/cargo/core/resolver/mod.rs
patch
|
blob
|
history
diff --git
a/src/cargo/core/resolver/mod.rs
b/src/cargo/core/resolver/mod.rs
index 8b512b90eef3e30e3d3428c6be85810d4e2b69cc..4587fc08c984c38b321b3847e9b45c0e5b073026 100644
(file)
--- a/
src/cargo/core/resolver/mod.rs
+++ b/
src/cargo/core/resolver/mod.rs
@@
-900,6
+900,10
@@
impl<'r> Requirements<'r> {
}
}
+ fn require_dependency(&mut self, pkg: &'r str) {
+ self.deps.entry(pkg).or_insert((false, Vec::new())).0 = true;
+ }
+
fn add_feature(&mut self, feat: &'r str) -> CargoResult<()> {
if feat.is_empty() { return Ok(()) }
@@
-933,7
+937,7
@@
impl<'r> Requirements<'r> {
}
None => {
// This is a dependency, mark it as explicitly requested.
- self.
deps.entry(feat).or_insert((false, Vec::new())).0 = true
;
+ self.
require_dependency(feat)
;
}
}
}