Skip to content

Make attribute API more private #6944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 19, 2020
Merged

Make attribute API more private #6944

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81ccf37
Remove `Attrs::merge`
jonas-schievink Dec 19, 2020
a2062d1
Make `RawAttrs` crate-private
jonas-schievink Dec 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions crates/hir_def/src/attr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ impl From<Documentation> for String {

/// Syntactical attributes, without filtering of `cfg_attr`s.
#[derive(Default, Debug, Clone, PartialEq, Eq)]
pub struct RawAttrs {
pub(crate) struct RawAttrs {
entries: Option<Arc<[Attr]>>,
}

Expand Down Expand Up @@ -72,7 +72,7 @@ impl ops::Deref for Attrs {
}

impl RawAttrs {
pub const EMPTY: Self = Self { entries: None };
pub(crate) const EMPTY: Self = Self { entries: None };

pub(crate) fn new(owner: &dyn AttrsOwner, hygiene: &Hygiene) -> Self {
let (inner_attrs, inner_docs) = inner_attributes(owner.syntax())
Expand Down Expand Up @@ -241,18 +241,6 @@ impl Attrs {
raw_attrs.filter(db, def.krate(db))
}

pub fn merge(&self, other: Attrs) -> Attrs {
match (&self.0.entries, &other.0.entries) {
(None, None) => Attrs::EMPTY,
(Some(entries), None) | (None, Some(entries)) => {
Attrs(RawAttrs { entries: Some(entries.clone()) })
}
(Some(a), Some(b)) => {
Attrs(RawAttrs { entries: Some(a.iter().chain(b.iter()).cloned().collect()) })
}
}
}

pub fn by_key(&self, key: &'static str) -> AttrQuery<'_> {
AttrQuery { attrs: self, key }
}
Expand Down