bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/layout.rs')
-rw-r--r--crates/hir-ty/src/layout.rs17
1 files changed, 8 insertions, 9 deletions
diff --git a/crates/hir-ty/src/layout.rs b/crates/hir-ty/src/layout.rs
index bbd419d965..167dcec3bb 100644
--- a/crates/hir-ty/src/layout.rs
+++ b/crates/hir-ty/src/layout.rs
@@ -2,7 +2,6 @@
use std::fmt;
-use base_db::ra_salsa::Cycle;
use chalk_ir::{AdtId, FloatTy, IntTy, TyKind, UintTy};
use hir_def::{
layout::{
@@ -14,21 +13,20 @@ use hir_def::{
use la_arena::{Idx, RawIdx};
use rustc_abi::AddressSpace;
use rustc_index::IndexVec;
+use salsa::Cycle;
use triomphe::Arc;
use crate::{
consteval::try_const_usize,
- db::{HirDatabase, InternedClosure},
+ db::{HirDatabase, HirDatabaseData, InternedClosure},
infer::normalize,
utils::ClosureSubst,
Interner, ProjectionTy, Substitution, TraitEnvironment, Ty,
};
-pub use self::{
- adt::{layout_of_adt_query, layout_of_adt_recover},
- target::target_data_layout_query,
-};
+pub(crate) use self::adt::layout_of_adt_recover;
+pub use self::{adt::layout_of_adt_query, target::target_data_layout_query};
mod adt;
mod target;
@@ -367,11 +365,12 @@ pub fn layout_of_ty_query(
Ok(Arc::new(result))
}
-pub fn layout_of_ty_recover(
+pub(crate) fn layout_of_ty_recover(
_: &dyn HirDatabase,
_: &Cycle,
- _: &Ty,
- _: &Arc<TraitEnvironment>,
+ _: HirDatabaseData,
+ _: Ty,
+ _: Arc<TraitEnvironment>,
) -> Result<Arc<Layout>, LayoutError> {
Err(LayoutError::RecursiveTypeWithoutIndirection)
}