diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-01-14 10:30:24 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2020-01-14 10:30:24 +0000 |
commit | 4820a9e790c4c41c7ffe1892ec576f7fd321e788 (patch) | |
tree | ef22688ef7d1486ac4f084ead6bcb7e69d520b65 /crates/ra_hir_ty/src | |
parent | 254650ff82d2e592e992cade4c9183c326fcf974 (diff) | |
parent | 52e7f67128fdaf604e4563eb6445fdd69d42c91e (diff) |
Merge #2836
2836: Move utility functions down r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty/src')
-rw-r--r-- | crates/ra_hir_ty/src/method_resolution.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crates/ra_hir_ty/src/method_resolution.rs b/crates/ra_hir_ty/src/method_resolution.rs index 888dc3116..55435e6ea 100644 --- a/crates/ra_hir_ty/src/method_resolution.rs +++ b/crates/ra_hir_ty/src/method_resolution.rs | |||
@@ -465,7 +465,7 @@ fn transform_receiver_ty( | |||
465 | pub fn implements_trait( | 465 | pub fn implements_trait( |
466 | ty: &Canonical<Ty>, | 466 | ty: &Canonical<Ty>, |
467 | db: &impl HirDatabase, | 467 | db: &impl HirDatabase, |
468 | resolver: &Resolver, | 468 | env: Arc<TraitEnvironment>, |
469 | krate: CrateId, | 469 | krate: CrateId, |
470 | trait_: TraitId, | 470 | trait_: TraitId, |
471 | ) -> bool { | 471 | ) -> bool { |
@@ -474,7 +474,6 @@ pub fn implements_trait( | |||
474 | // anyway, but currently Chalk doesn't implement `dyn/impl Trait` yet | 474 | // anyway, but currently Chalk doesn't implement `dyn/impl Trait` yet |
475 | return true; | 475 | return true; |
476 | } | 476 | } |
477 | let env = TraitEnvironment::lower(db, resolver); | ||
478 | let goal = generic_implements_goal(db, env, trait_, ty.clone()); | 477 | let goal = generic_implements_goal(db, env, trait_, ty.clone()); |
479 | let solution = db.trait_solve(krate.into(), goal); | 478 | let solution = db.trait_solve(krate.into(), goal); |
480 | 479 | ||