Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 09:27:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up visibilities

Browse source
This commit is contained in:
Florian Diebold 2021-05-21 19:50:18 +02:00
parent 67f1a08fd8
commit ef558c97d0
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
crates/hir_ty/src/infer/unify.rs
View file

@ -136,10 +136,10 @@ type ChalkInferenceTable = chalk_solve::infer::InferenceTable<Interner>;
#[derive(Clone)] #[derive(Clone)]
pub(crate) struct InferenceTable<'a> { pub(crate) struct InferenceTable<'a> {
pub db: &'a dyn HirDatabase, pub(crate) db: &'a dyn HirDatabase,
pub trait_env: Arc<TraitEnvironment>, pub(crate) trait_env: Arc<TraitEnvironment>,
pub(super) var_unification_table: ChalkInferenceTable, var_unification_table: ChalkInferenceTable,
pub(super) type_variable_table: Vec<TypeVariableData>, type_variable_table: Vec<TypeVariableData>,
pending_obligations: Vec<Canonicalized<InEnvironment<Goal>>>, pending_obligations: Vec<Canonicalized<InEnvironment<Goal>>>,
} }
@ -332,7 +332,7 @@ impl<'a> InferenceTable<'a> {
self.var_unification_table.normalize_ty_shallow(&Interner, ty).unwrap_or_else(|| ty.clone()) self.var_unification_table.normalize_ty_shallow(&Interner, ty).unwrap_or_else(|| ty.clone())
} }
pub fn register_obligation(&mut self, goal: Goal) { pub(crate) fn register_obligation(&mut self, goal: Goal) {
let in_env = InEnvironment::new(&self.trait_env.env, goal); let in_env = InEnvironment::new(&self.trait_env.env, goal);
self.register_obligation_in_env(in_env) self.register_obligation_in_env(in_env)
} }
@ -344,11 +344,11 @@ impl<'a> InferenceTable<'a> {
} }
} }
pub fn register_infer_ok(&mut self, infer_ok: InferOk) { pub(crate) fn register_infer_ok(&mut self, infer_ok: InferOk) {
infer_ok.goals.into_iter().for_each(|goal| self.register_obligation_in_env(goal)); infer_ok.goals.into_iter().for_each(|goal| self.register_obligation_in_env(goal));
} }
pub fn resolve_obligations_as_possible(&mut self) { pub(crate) fn resolve_obligations_as_possible(&mut self) {
let _span = profile::span("resolve_obligations_as_possible"); let _span = profile::span("resolve_obligations_as_possible");
let mut changed = true; let mut changed = true;
let mut obligations = Vec::new(); let mut obligations = Vec::new();
@ -445,9 +445,9 @@ mod resolve {
use hir_def::type_ref::ConstScalar; use hir_def::type_ref::ConstScalar;
pub(super) struct Resolver<'a, 'b, F> { pub(super) struct Resolver<'a, 'b, F> {
pub table: &'a mut InferenceTable<'b>, pub(super) table: &'a mut InferenceTable<'b>,
pub var_stack: &'a mut Vec<InferenceVar>, pub(super) var_stack: &'a mut Vec<InferenceVar>,
pub fallback: F, pub(super) fallback: F,
} }
impl<'a, 'b, 'i, F> Folder<'i, Interner> for Resolver<'a, 'b, F> impl<'a, 'b, 'i, F> Folder<'i, Interner> for Resolver<'a, 'b, F>
where where