bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/infer/autoderef.rs')
-rw-r--r--crates/hir-ty/src/infer/autoderef.rs23
1 files changed, 12 insertions, 11 deletions
diff --git a/crates/hir-ty/src/infer/autoderef.rs b/crates/hir-ty/src/infer/autoderef.rs
index ba133aa553..d748c89e67 100644
--- a/crates/hir-ty/src/infer/autoderef.rs
+++ b/crates/hir-ty/src/infer/autoderef.rs
@@ -6,7 +6,7 @@ use rustc_ast_ir::Mutability;
use crate::{
Adjust, Adjustment, OverloadedDeref,
- autoderef::{Autoderef, AutoderefKind},
+ autoderef::{Autoderef, AutoderefCtx, AutoderefKind, GeneralAutoderef},
infer::unify::InferenceTable,
next_solver::{
Ty,
@@ -15,19 +15,17 @@ use crate::{
};
impl<'db> InferenceTable<'db> {
- pub(crate) fn autoderef(&mut self, base_ty: Ty<'db>) -> Autoderef<'_, 'db> {
- Autoderef::new(self, base_ty)
+ pub(crate) fn autoderef(&self, base_ty: Ty<'db>) -> Autoderef<'_, 'db, usize> {
+ Autoderef::new(&self.infer_ctxt, self.param_env, base_ty)
}
-}
-impl<'db> Autoderef<'_, 'db> {
- /// Returns the adjustment steps.
- pub(crate) fn adjust_steps(mut self) -> Vec<Adjustment<'db>> {
- let infer_ok = self.adjust_steps_as_infer_ok();
- self.table.register_infer_ok(infer_ok)
+ pub(crate) fn autoderef_with_tracking(&self, base_ty: Ty<'db>) -> Autoderef<'_, 'db> {
+ Autoderef::new_with_tracking(&self.infer_ctxt, self.param_env, base_ty)
}
+}
- pub(crate) fn adjust_steps_as_infer_ok(&mut self) -> InferOk<'db, Vec<Adjustment<'db>>> {
+impl<'db, Ctx: AutoderefCtx<'db>> GeneralAutoderef<'db, Ctx> {
+ pub(crate) fn adjust_steps_as_infer_ok(&mut self) -> InferOk<'db, Vec<Adjustment>> {
let steps = self.steps();
if steps.is_empty() {
return InferOk { obligations: PredicateObligations::new(), value: vec![] };
@@ -44,7 +42,10 @@ impl<'db> Autoderef<'_, 'db> {
}
})
.zip(targets)
- .map(|(autoderef, target)| Adjustment { kind: Adjust::Deref(autoderef), target })
+ .map(|(autoderef, target)| Adjustment {
+ kind: Adjust::Deref(autoderef),
+ target: target.store(),
+ })
.collect();
InferOk { obligations: self.take_obligations(), value: steps }