Skip to content

Commit 4859312

Browse files
committed
refactor: merge clippy fixes from dev
2 parents 2380199 + 7f3ae14 commit 4859312

File tree

4 files changed

+32
-34
lines changed

4 files changed

+32
-34
lines changed

src/internal/incompatibility.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ impl<P: Package, VS: VersionSet> Incompatibility<P, VS> {
151151
false
152152
} else {
153153
let (package, term) = self.package_terms.iter().next().unwrap();
154-
(package == root_package) && term.contains(&root_version)
154+
(package == root_package) && term.contains(root_version)
155155
}
156156
}
157157

@@ -219,7 +219,7 @@ impl<'a, P: Package, VS: VersionSet + 'a> Incompatibility<P, VS> {
219219
pub fn relation(&self, terms: impl Fn(&P) -> Option<&'a Term<VS>>) -> Relation<P> {
220220
let mut relation = Relation::Satisfied;
221221
for (package, incompat_term) in self.package_terms.iter() {
222-
match terms(package).map(|term| incompat_term.relation_with(&term)) {
222+
match terms(package).map(|term| incompat_term.relation_with(term)) {
223223
Some(term::Relation::Satisfied) => {}
224224
Some(term::Relation::Contradicted) => {
225225
return Relation::Contradicted(package.clone());

src/internal/partial_solution.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ impl<P: Package, VS: VersionSet> PartialSolution<P, VS> {
222222
pa.dated_derivations
223223
.iter()
224224
.fold(Term::any(), |acc, dated_derivation| {
225-
let term = store[dated_derivation.cause].get(&p).unwrap().negate();
225+
let term = store[dated_derivation.cause].get(p).unwrap().negate();
226226
acc.intersection(&term)
227227
}),
228228
);

src/solver.rs

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -139,38 +139,37 @@ pub fn resolve<P: Package, VS: VersionSet>(
139139
{
140140
// Retrieve that package dependencies.
141141
let p = &next;
142-
let dependencies =
143-
match dependency_provider
144-
.get_dependencies(&p, &v)
145-
.map_err(|err| PubGrubError::ErrorRetrievingDependencies {
146-
package: p.clone(),
147-
version: v.clone(),
148-
source: err,
149-
})? {
150-
Dependencies::Unknown => {
151-
state.add_incompatibility(Incompatibility::unavailable_dependencies(
152-
p.clone(),
153-
v.clone(),
154-
));
155-
continue;
142+
let dependencies = match dependency_provider.get_dependencies(p, &v).map_err(|err| {
143+
PubGrubError::ErrorRetrievingDependencies {
144+
package: p.clone(),
145+
version: v.clone(),
146+
source: err,
147+
}
148+
})? {
149+
Dependencies::Unknown => {
150+
state.add_incompatibility(Incompatibility::unavailable_dependencies(
151+
p.clone(),
152+
v.clone(),
153+
));
154+
continue;
155+
}
156+
Dependencies::Known(x) => {
157+
if x.contains_key(p) {
158+
return Err(PubGrubError::SelfDependency {
159+
package: p.clone(),
160+
version: v.clone(),
161+
});
156162
}
157-
Dependencies::Known(x) => {
158-
if x.contains_key(&p) {
159-
return Err(PubGrubError::SelfDependency {
160-
package: p.clone(),
161-
version: v.clone(),
162-
});
163-
}
164-
if let Some((dependent, _)) = x.iter().find(|(_, r)| r == &&VS::empty()) {
165-
return Err(PubGrubError::DependencyOnTheEmptySet {
166-
package: p.clone(),
167-
version: v.clone(),
168-
dependent: dependent.clone(),
169-
});
170-
}
171-
x
163+
if let Some((dependent, _)) = x.iter().find(|(_, r)| r == &&VS::empty()) {
164+
return Err(PubGrubError::DependencyOnTheEmptySet {
165+
package: p.clone(),
166+
version: v.clone(),
167+
dependent: dependent.clone(),
168+
});
172169
}
173-
};
170+
x
171+
}
172+
};
174173

175174
// Add that package and version if the dependencies are not problematic.
176175
let dep_incompats =

src/term.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ impl<VS: VersionSet> Term<VS> {
159159
}
160160
}
161161

162-
// impl<V: Version> AsRef<Term<V>> for Term<V> {
163162
impl<VS: VersionSet> AsRef<Self> for Term<VS> {
164163
fn as_ref(&self) -> &Self {
165164
self

0 commit comments

Comments
 (0)