language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Auto merge of #15760 - ChristianSchott:master, r=HKalbasi

Browse source 
make mir::ProjectionStore-impls pub-accessible

When using RA as a crate the `mir::Place` `projection` is accessible, however there is no way to translate the `ProjectionId` to a `&[PlaceElem]`, as the `ProjectionId::lookup` is private.

Personally, I would only need the `ProjectionId::lookup`-fn to be `pub`, but I don't see any reason why the others should be kept private.. am I missing something `@HKalbasi` ?

Relates to: https://github.com/rust-lang/rust-analyzer/pull/15575
This commit is contained in:
bors 2023-10-14 18:07:56 +00:00
commit dbe5392010
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/hir-ty/src/mir.rs
View file

@ -243,16 +243,16 @@ impl Default for ProjectionStore {
} }
impl ProjectionStore { impl ProjectionStore {
fn shrink_to_fit(&mut self) { pub fn shrink_to_fit(&mut self) {
self.id_to_proj.shrink_to_fit(); self.id_to_proj.shrink_to_fit();
self.proj_to_id.shrink_to_fit(); self.proj_to_id.shrink_to_fit();
} }
fn intern_if_exist(&self, projection: &[PlaceElem]) -> Option<ProjectionId> { pub fn intern_if_exist(&self, projection: &[PlaceElem]) -> Option<ProjectionId> {
self.proj_to_id.get(projection).copied() self.proj_to_id.get(projection).copied()
} }
fn intern(&mut self, projection: Box<[PlaceElem]>) -> ProjectionId { pub fn intern(&mut self, projection: Box<[PlaceElem]>) -> ProjectionId {
let new_id = ProjectionId(self.proj_to_id.len() as u32); let new_id = ProjectionId(self.proj_to_id.len() as u32);
match self.proj_to_id.entry(projection) { match self.proj_to_id.entry(projection) {
Entry::Occupied(id) => *id.get(), Entry::Occupied(id) => *id.get(),
@ -267,13 +267,13 @@ impl ProjectionStore {
} }
impl ProjectionId { impl ProjectionId {
const EMPTY: ProjectionId = ProjectionId(0); pub const EMPTY: ProjectionId = ProjectionId(0);
fn lookup(self, store: &ProjectionStore) -> &[PlaceElem] { pub fn lookup(self, store: &ProjectionStore) -> &[PlaceElem] {
store.id_to_proj.get(&self).unwrap() store.id_to_proj.get(&self).unwrap()
} }
fn project(self, projection: PlaceElem, store: &mut ProjectionStore) -> ProjectionId { pub fn project(self, projection: PlaceElem, store: &mut ProjectionStore) -> ProjectionId {
let mut current = self.lookup(store).to_vec(); let mut current = self.lookup(store).to_vec();
current.push(projection); current.push(projection);
store.intern(current.into()) store.intern(current.into())