languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-10-03 23:35:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't panic in semantics due to cfg_attr disrupting offsets

Browse source
This commit is contained in:
Lukas Wirth 2022-01-23 17:29:31 +01:00
parent baa5cd9527
commit ebd723995a
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crates/hir/src/semantics.rs
View file

@ -931,7 +931,8 @@ fn resolve_derive_ident(
file.with_value(derive.clone()),
)?;
let attrs = adt_def.attrs(self.db);
let mut derive_paths = attrs[attr_id].parse_path_comma_token_tree()?;
// FIXME: https://github.com/rust-analyzer/rust-analyzer/issues/11298
let mut derive_paths = attrs.get(attr_id)?.parse_path_comma_token_tree()?;
let derive_idx = tt
.syntax()

5
crates/hir_def/src/attr.rs
View file

@ -72,6 +72,11 @@ fn deref(&self) -> &[Attr] {
}
}
}
impl Attrs {
pub fn get(&self, AttrId { ast_index, .. }: AttrId) -> Option<&Attr> {
(**self).get(ast_index as usize)
}
}
impl ops::Deref for Attrs {
type Target = [Attr];