Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/db.rs')
| -rw-r--r-- | crates/hir-ty/src/db.rs | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/crates/hir-ty/src/db.rs b/crates/hir-ty/src/db.rs index 6058157143..c74ac51b61 100644 --- a/crates/hir-ty/src/db.rs +++ b/crates/hir-ty/src/db.rs @@ -27,7 +27,7 @@ use crate::{ dyn_compatibility::DynCompatibilityViolation, layout::{Layout, LayoutError}, lower::{GenericDefaults, TrackedStructToken, TypeAliasBounds}, - mir::{BorrowckResult, MirBody, MirLowerError}, + mir::{MirBody, MirLowerError}, next_solver::{ Allocation, Clause, EarlyBinder, GenericArgs, ParamEnv, PolyFnSig, StoredClauses, StoredEarlyBinder, StoredGenericArgs, StoredPolyFnSig, StoredTraitRef, StoredTy, TraitRef, @@ -40,16 +40,16 @@ use crate::{ pub trait HirDatabase: SourceDatabase + std::fmt::Debug { // region:mir - // FXME: Collapse `mir_body_for_closure` into `mir_body` + // FIXME: Collapse `mir_body_for_closure` into `mir_body` // and `monomorphized_mir_body_for_closure` into `monomorphized_mir_body` #[salsa::transparent] fn mir_body(&self, def: InferBodyId) -> Result<&MirBody, MirLowerError> { - crate::mir::mir_body_query(self, def).as_ref().map_err(|err| err.clone()) + crate::mir::mir_body_query(self, def).map_err(|err| err.clone()) } #[salsa::transparent] fn mir_body_for_closure(&self, def: InternedClosureId) -> Result<&MirBody, MirLowerError> { - crate::mir::mir_body_for_closure_query(self, def).as_ref().map_err(|err| err.clone()) + crate::mir::mir_body_for_closure_query(self, def).map_err(|err| err.clone()) } #[salsa::transparent] @@ -59,9 +59,7 @@ pub trait HirDatabase: SourceDatabase + std::fmt::Debug { subst: StoredGenericArgs, env: StoredParamEnvAndCrate, ) -> Result<&MirBody, MirLowerError> { - crate::mir::monomorphized_mir_body_query(self, def, subst, env) - .as_ref() - .map_err(|err| err.clone()) + crate::mir::monomorphized_mir_body_query(self, def, subst, env).map_err(|err| err.clone()) } #[salsa::transparent] @@ -72,15 +70,9 @@ pub trait HirDatabase: SourceDatabase + std::fmt::Debug { env: StoredParamEnvAndCrate, ) -> Result<&MirBody, MirLowerError> { crate::mir::monomorphized_mir_body_for_closure_query(self, def, subst, env) - .as_ref() .map_err(|err| err.clone()) } - #[salsa::transparent] - fn borrowck(&self, def: InferBodyId) -> Result<&[BorrowckResult], MirLowerError> { - crate::mir::borrowck_query(self, def).as_ref().map(|it| &**it).map_err(|err| err.clone()) - } - #[salsa::invoke(crate::consteval::const_eval)] #[salsa::transparent] fn const_eval<'db>( @@ -137,7 +129,7 @@ pub trait HirDatabase: SourceDatabase + std::fmt::Debug { #[salsa::transparent] fn target_data_layout(&self, krate: Crate) -> Result<&TargetDataLayout, TargetLoadError> { - crate::layout::target_data_layout_query(self, krate).as_ref().map_err(|err| err.clone()) + crate::layout::target_data_layout_query(self, krate).map_err(|err| err.clone()) } #[salsa::invoke(crate::dyn_compatibility::dyn_compatibility_of_trait_query)] |