nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix case where non FnOnce variables is marked callable

Browse Source
This commit is contained in:
GrayJack 2020-10-26 15:20:33 -03:00
parent d01e412eb1
commit 08e95a5dc1
No known key found for this signature in database
GPG Key ID: 12C54E04AAB9931E
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/hir/src/code_model.rs
View File

@ -1398,7 +1398,7 @@ impl Type {
}; };
let canonical_ty = Canonical { value: self.ty.value.clone(), kinds: Arc::new([]) }; let canonical_ty = Canonical { value: self.ty.value.clone(), kinds: Arc::new([]) };
method_resolution::implements_trait( method_resolution::implements_trait_unique(
&canonical_ty, &canonical_ty,
db, db,
self.ty.environment.clone(), self.ty.environment.clone(),

13
crates/hir_ty/src/method_resolution.rs
View File

@ -740,6 +740,19 @@ pub fn implements_trait(
solution.is_some() solution.is_some()
} }
pub fn implements_trait_unique(
ty: &Canonical<Ty>,
db: &dyn HirDatabase,
env: Arc<TraitEnvironment>,
krate: CrateId,
trait_: TraitId,
) -> bool {
let goal = generic_implements_goal(db, env, trait_, ty.clone());
let solution = db.trait_solve(krate, goal);
matches!(solution, Some(crate::traits::Solution::Unique(_)))
}
/// This creates Substs for a trait with the given Self type and type variables /// This creates Substs for a trait with the given Self type and type variables
/// for all other parameters, to query Chalk with it. /// for all other parameters, to query Chalk with it.
fn generic_implements_goal( fn generic_implements_goal(