Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir/src/lib.rs')
| -rw-r--r-- | crates/hir/src/lib.rs | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index b3a8a33cac..1fac95ae5e 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs @@ -2611,6 +2611,10 @@ impl LocalSource { self.source.file_id.original_file(db.upcast()) } + pub fn file(&self) -> HirFileId { + self.source.file_id + } + pub fn name(&self) -> Option<ast::Name> { self.source.value.name() } @@ -3210,7 +3214,11 @@ impl Closure { let owner = db.lookup_intern_closure((self.id).into()).0; let infer = &db.infer(owner); let info = infer.closure_info(&self.id); - info.0.iter().cloned().map(|capture| ClosureCapture { owner, capture }).collect() + info.0 + .iter() + .cloned() + .map(|capture| ClosureCapture { owner, closure: self.id, capture }) + .collect() } pub fn fn_trait(&self, db: &dyn HirDatabase) -> FnTrait { @@ -3224,6 +3232,7 @@ impl Closure { #[derive(Clone, Debug, PartialEq, Eq)] pub struct ClosureCapture { owner: DefWithBodyId, + closure: ClosureId, capture: hir_ty::CapturedItem, } @@ -3232,15 +3241,33 @@ impl ClosureCapture { Local { parent: self.owner, binding_id: self.capture.local() } } - pub fn display_kind(&self) -> &'static str { - self.capture.display_kind() + pub fn kind(&self) -> CaptureKind { + match self.capture.kind() { + hir_ty::CaptureKind::ByRef( + hir_ty::mir::BorrowKind::Shallow | hir_ty::mir::BorrowKind::Shared, + ) => CaptureKind::SharedRef, + hir_ty::CaptureKind::ByRef(hir_ty::mir::BorrowKind::Unique) => { + CaptureKind::UniqueSharedRef + } + hir_ty::CaptureKind::ByRef(hir_ty::mir::BorrowKind::Mut { .. }) => { + CaptureKind::MutableRef + } + hir_ty::CaptureKind::ByValue => CaptureKind::Move, + } } - pub fn display_place(&self, owner: ClosureId, db: &dyn HirDatabase) -> String { - self.capture.display_place(owner, db) + pub fn display_place(&self, db: &dyn HirDatabase) -> String { + self.capture.display_place(self.owner, db) } } +pub enum CaptureKind { + SharedRef, + UniqueSharedRef, + MutableRef, + Move, +} + #[derive(Clone, PartialEq, Eq, Debug)] pub struct Type { env: Arc<TraitEnvironment>, |