Move AttributeSet into its own file

src/attribute.rs

@@ -133,65 +133,6 @@ impl<'src> Display for Attribute<'src> {
   }
 }
 
-#[derive(Default, Debug, Clone, PartialEq, Serialize)]
-pub(crate) struct AttributeSet<'src>(BTreeSet<Attribute<'src>>);
-
-impl<'src, 'a> IntoIterator for &'a AttributeSet<'src> {
-  type Item = &'a Attribute<'src>;
-
-  type IntoIter = collections::btree_set::Iter<'a, Attribute<'src>>;
-
-  fn into_iter(self) -> Self::IntoIter {
-    self.0.iter()
-  }
-}
-
-impl<'src, 'a> FromIterator<Attribute<'src>> for AttributeSet<'src> {
-  fn from_iter<T: IntoIterator<Item = attribute::Attribute<'src>>>(iter: T) -> Self {
-    Self(iter.into_iter().collect())
-  }
-}
-
-impl<'src> AttributeSet<'src> {
-  pub(crate) fn len(&self) -> usize {
-    self.0.len()
-  }
-
-  pub(crate) fn contains(&self, target: AttributeDiscriminant) -> bool {
-    self.0.iter().any(|attr| attr.discriminant() == target)
-  }
-
-  pub(crate) fn get(&self, discriminant: AttributeDiscriminant) -> Option<&Attribute<'src>> {
-    self
-      .0
-      .iter()
-      .find(|attr| discriminant == attr.discriminant())
-  }
-
-  pub(crate) fn iter(&self) -> impl Iterator<Item = &Attribute<'src>> {
-    self.0.iter()
-  }
-
-  pub(crate) fn ensure_valid_attributes(
-    &self,
-    item_kind: &'static str,
-    item_token: Token<'src>,
-    valid: &[AttributeDiscriminant],
-  ) -> Result<(), CompileError<'src>> {
-    for attribute in &self.0 {
-      let discriminant = attribute.discriminant();
-      if !valid.contains(&discriminant) {
-        return Err(item_token.error(CompileErrorKind::InvalidAttribute {
-          item_kind,
-          item_name: item_token.lexeme(),
-          attribute: attribute.clone(),
-        }));
-      }
-    }
-    Ok(())
-  }
-}
-
 #[cfg(test)]
 mod tests {
   use super::*;

src/attribute_set.rs

@@ -0,0 +1,60 @@
+use {super::*, std::collections};
+
+#[derive(Default, Debug, Clone, PartialEq, Serialize)]
+pub(crate) struct AttributeSet<'src>(BTreeSet<Attribute<'src>>);
+
+impl<'src> AttributeSet<'src> {
+  pub(crate) fn len(&self) -> usize {
+    self.0.len()
+  }
+
+  pub(crate) fn contains(&self, target: AttributeDiscriminant) -> bool {
+    self.0.iter().any(|attr| attr.discriminant() == target)
+  }
+
+  pub(crate) fn get(&self, discriminant: AttributeDiscriminant) -> Option<&Attribute<'src>> {
+    self
+      .0
+      .iter()
+      .find(|attr| discriminant == attr.discriminant())
+  }
+
+  pub(crate) fn iter(&self) -> impl Iterator<Item = &Attribute<'src>> {
+    self.0.iter()
+  }
+
+  pub(crate) fn ensure_valid_attributes(
+    &self,
+    item_kind: &'static str,
+    item_token: Token<'src>,
+    valid: &[AttributeDiscriminant],
+  ) -> Result<(), CompileError<'src>> {
+    for attribute in &self.0 {
+      let discriminant = attribute.discriminant();
+      if !valid.contains(&discriminant) {
+        return Err(item_token.error(CompileErrorKind::InvalidAttribute {
+          item_kind,
+          item_name: item_token.lexeme(),
+          attribute: attribute.clone(),
+        }));
+      }
+    }
+    Ok(())
+  }
+}
+
+impl<'src, 'a> FromIterator<Attribute<'src>> for AttributeSet<'src> {
+  fn from_iter<T: IntoIterator<Item = attribute::Attribute<'src>>>(iter: T) -> Self {
+    Self(iter.into_iter().collect())
+  }
+}
+
+impl<'src, 'a> IntoIterator for &'a AttributeSet<'src> {
+  type Item = &'a Attribute<'src>;
+
+  type IntoIter = collections::btree_set::Iter<'a, Attribute<'src>>;
+
+  fn into_iter(self) -> Self::IntoIter {
+    self.0.iter()
+  }
+}

src/lib.rs

@@ -12,7 +12,8 @@ pub(crate) use {
     assignment::Assignment,
     assignment_resolver::AssignmentResolver,
     ast::Ast,
-    attribute::{Attribute, AttributeDiscriminant, AttributeSet},
+    attribute::{Attribute, AttributeDiscriminant},
+    attribute_set::AttributeSet,
     binding::Binding,
     color::Color,
     color_display::ColorDisplay,
@@ -177,6 +178,7 @@ mod assignment;
 mod assignment_resolver;
 mod ast;
 mod attribute;
+mod attribute_set;
 mod binding;
 mod color;
 mod color_display;