itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename Attrs index field to id

Browse Source
This commit is contained in:
Jonas Schievink 2021-04-09 13:36:22 +02:00
parent 3fcdd1bcdf
commit 546da15972
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/hir_def/src/attr.rs
View File

@ -103,7 +103,7 @@ impl RawAttrs {
match attr { match attr {
Either::Left(attr) => Attr::from_src(attr, hygiene, index), Either::Left(attr) => Attr::from_src(attr, hygiene, index),
Either::Right(comment) => comment.doc_comment().map(|doc| Attr { Either::Right(comment) => comment.doc_comment().map(|doc| Attr {
index, id: index,
input: Some(AttrInput::Literal(SmolStr::new(doc))), input: Some(AttrInput::Literal(SmolStr::new(doc))),
path: Interned::new(ModPath::from(hir_expand::name!(doc))), path: Interned::new(ModPath::from(hir_expand::name!(doc))),
}), }),
@ -164,7 +164,7 @@ impl RawAttrs {
let cfg = parts.next().unwrap(); let cfg = parts.next().unwrap();
let cfg = Subtree { delimiter: subtree.delimiter, token_trees: cfg.to_vec() }; let cfg = Subtree { delimiter: subtree.delimiter, token_trees: cfg.to_vec() };
let cfg = CfgExpr::parse(&cfg); let cfg = CfgExpr::parse(&cfg);
let index = attr.index; let index = attr.id;
let attrs = parts.filter(|a| !a.is_empty()).filter_map(|attr| { let attrs = parts.filter(|a| !a.is_empty()).filter_map(|attr| {
let tree = Subtree { delimiter: None, token_trees: attr.to_vec() }; let tree = Subtree { delimiter: None, token_trees: attr.to_vec() };
let attr = ast::Attr::parse(&format!("#[{}]", tree)).ok()?; let attr = ast::Attr::parse(&format!("#[{}]", tree)).ok()?;
@ -471,7 +471,7 @@ impl AttrsWithOwner {
) -> Option<(Documentation, DocsRangeMap)> { ) -> Option<(Documentation, DocsRangeMap)> {
// FIXME: code duplication in `docs` above // FIXME: code duplication in `docs` above
let docs = self.by_key("doc").attrs().flat_map(|attr| match attr.input.as_ref()? { let docs = self.by_key("doc").attrs().flat_map(|attr| match attr.input.as_ref()? {
AttrInput::Literal(s) => Some((s, attr.index)), AttrInput::Literal(s) => Some((s, attr.id)),
AttrInput::TokenTree(_) => None, AttrInput::TokenTree(_) => None,
}); });
let indent = docs let indent = docs
@ -563,8 +563,8 @@ impl AttrSourceMap {
/// the attribute represented by `Attr`. /// the attribute represented by `Attr`.
pub fn source_of(&self, attr: &Attr) -> InFile<&Either<ast::Attr, ast::Comment>> { pub fn source_of(&self, attr: &Attr) -> InFile<&Either<ast::Attr, ast::Comment>> {
self.attrs self.attrs
.get(attr.index.0 as usize) .get(attr.id.0 as usize)
.unwrap_or_else(|| panic!("cannot find `Attr` at index {:?}", attr.index)) .unwrap_or_else(|| panic!("cannot find `Attr` at index {:?}", attr.id))
.as_ref() .as_ref()
} }
} }
@ -609,7 +609,7 @@ impl DocsRangeMap {
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]
pub struct Attr { pub struct Attr {
pub(crate) index: AttrId, pub(crate) id: AttrId,
pub(crate) path: Interned<ModPath>, pub(crate) path: Interned<ModPath>,
pub(crate) input: Option<AttrInput>, pub(crate) input: Option<AttrInput>,
} }
@ -623,7 +623,7 @@ pub enum AttrInput {
} }
impl Attr { impl Attr {
fn from_src(ast: ast::Attr, hygiene: &Hygiene, index: AttrId) -> Option<Attr> { fn from_src(ast: ast::Attr, hygiene: &Hygiene, id: AttrId) -> Option<Attr> {
let path = Interned::new(ModPath::from_src(ast.path()?, hygiene)?); let path = Interned::new(ModPath::from_src(ast.path()?, hygiene)?);
let input = if let Some(ast::Expr::Literal(lit)) = ast.expr() { let input = if let Some(ast::Expr::Literal(lit)) = ast.expr() {
let value = match lit.kind() { let value = match lit.kind() {
@ -636,7 +636,7 @@ impl Attr {
} else { } else {
None None
}; };
Some(Attr { index, path, input }) Some(Attr { id, path, input })
} }
/// Parses this attribute as a `#[derive]`, returns an iterator that yields all contained paths /// Parses this attribute as a `#[derive]`, returns an iterator that yields all contained paths