language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 04:19:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

internal: Don't expose InferenceTable outside of hir-ty

Browse source
This commit is contained in:
Lukas Wirth 2023-03-30 13:18:44 +02:00
parent b915eb32fa
commit fc840dbb2d
6 changed files with 49 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/hir-ty/src/infer/expr.rs
View file

@ -23,7 +23,7 @@ use stdx::always;
use syntax::ast::RangeOp;
use crate::{
autoderef::{self, Autoderef},
autoderef::{builtin_deref, deref_by_trait, Autoderef},
consteval,
infer::{
coerce::CoerceMany, find_continuable, pat::contains_explicit_ref_binding, BreakableKind,
@ -675,12 +675,10 @@ impl<'a> InferenceContext<'a> {
);
}
}
if let Some(derefed) =
autoderef::builtin_deref(&mut self.table, &inner_ty, true)
{
if let Some(derefed) = builtin_deref(&mut self.table, &inner_ty, true) {
self.resolve_ty_shallow(derefed)
} else {
autoderef::deref_by_trait(&mut self.table, inner_ty)
deref_by_trait(&mut self.table, inner_ty)
.unwrap_or_else(|| self.err_ty())
}
}
@ -793,7 +791,7 @@ impl<'a> InferenceContext<'a> {
let canonicalized = self.canonicalize(base_ty.clone());
let receiver_adjustments = method_resolution::resolve_indexing_op(
self.db,
&mut self.table,
self.table.trait_env.clone(),
canonicalized.value,
index_trait,
);