Skip to content

Commit 7f3ae14

Browse files
authored
refactor: make clippy happy (#106)
1 parent a2d2c65 commit 7f3ae14

File tree

4 files changed

+33
-34
lines changed

4 files changed

+33
-34
lines changed

src/internal/incompatibility.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ impl<P: Package, V: Version> Incompatibility<P, V> {
152152
false
153153
} else {
154154
let (package, term) = self.package_terms.iter().next().unwrap();
155-
(package == root_package) && term.contains(&root_version)
155+
(package == root_package) && term.contains(root_version)
156156
}
157157
}
158158

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

src/internal/partial_solution.rs

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

src/solver.rs

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

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

src/term.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ impl<'a, V: 'a + Version> Term<V> {
162162

163163
impl<V: Version> AsRef<Term<V>> for Term<V> {
164164
fn as_ref(&self) -> &Term<V> {
165-
&self
165+
self
166166
}
167167
}
168168

0 commit comments

Comments
 (0)