diff --git a/crates/oxc_parser/src/js/class.rs b/crates/oxc_parser/src/js/class.rs index 838ae47134582..da6407bc7528a 100644 --- a/crates/oxc_parser/src/js/class.rs +++ b/crates/oxc_parser/src/js/class.rs @@ -238,7 +238,7 @@ impl<'a, C: Config> ParserImpl<'a, C> { } self.verify_modifiers( &modifiers, - ModifierKinds::empty(), + ModifierKinds::none(), false, diagnostics::modifiers_cannot_appear_here, ); diff --git a/crates/oxc_parser/src/js/function.rs b/crates/oxc_parser/src/js/function.rs index 31eb0a3110b98..56f66f1574403 100644 --- a/crates/oxc_parser/src/js/function.rs +++ b/crates/oxc_parser/src/js/function.rs @@ -166,7 +166,7 @@ impl<'a, C: Config> ParserImpl<'a, C> { ModifierKind::Readonly, ]) } else { - ModifierKinds::empty() + ModifierKinds::none() }; self.verify_modifiers( &modifiers, @@ -177,7 +177,7 @@ impl<'a, C: Config> ParserImpl<'a, C> { } else { self.verify_modifiers( &modifiers, - ModifierKinds::empty(), + ModifierKinds::none(), true, diagnostics::parameter_modifiers_in_ts, ); diff --git a/crates/oxc_parser/src/js/object.rs b/crates/oxc_parser/src/js/object.rs index 401ee7736998c..85b3391f9fe5d 100644 --- a/crates/oxc_parser/src/js/object.rs +++ b/crates/oxc_parser/src/js/object.rs @@ -89,7 +89,7 @@ impl<'a, C: Config> ParserImpl<'a, C> { self.verify_modifiers( &modifiers, - ModifierKinds::empty(), + ModifierKinds::none(), true, diagnostics::modifier_cannot_be_used_here, ); @@ -219,7 +219,7 @@ impl<'a, C: Config> ParserImpl<'a, C> { } self.verify_modifiers( modifiers, - ModifierKinds::empty(), + ModifierKinds::none(), true, diagnostics::modifier_cannot_be_used_here, ); diff --git a/crates/oxc_parser/src/modifiers.rs b/crates/oxc_parser/src/modifiers.rs index 2246652650c55..368c84c64b1ed 100644 --- a/crates/oxc_parser/src/modifiers.rs +++ b/crates/oxc_parser/src/modifiers.rs @@ -20,7 +20,7 @@ impl ModifierKinds { /// Create a set from an array of modifier kinds. #[inline] pub const fn new(kinds: [ModifierKind; N]) -> Self { - let mut out = Self::empty(); + let mut out = Self::none(); let mut i = 0; while i < N { out = out.with(kinds[i]); @@ -38,7 +38,7 @@ impl ModifierKinds { /// Empty set (no modifiers). #[inline] - pub const fn empty() -> Self { + pub const fn none() -> Self { Self(0) } @@ -182,13 +182,13 @@ impl<'a> Modifiers<'a> { if let Some(modifiers) = &modifiers { assert!(!modifiers.is_empty()); - let mut found_kinds = ModifierKinds::empty(); + let mut found_kinds = ModifierKinds::none(); for modifier in modifiers { found_kinds = found_kinds.with(modifier.kind); } assert_eq!(found_kinds, kinds); } else { - assert_eq!(kinds, ModifierKinds::empty()); + assert_eq!(kinds, ModifierKinds::none()); } } @@ -196,7 +196,7 @@ impl<'a> Modifiers<'a> { } pub fn empty() -> Self { - Self { modifiers: None, kinds: ModifierKinds::empty() } + Self { modifiers: None, kinds: ModifierKinds::none() } } pub fn contains(&self, target: ModifierKind) -> bool { @@ -337,7 +337,7 @@ impl<'a, C: Config> ParserImpl<'a, C> { if !self.at_modifier() { return Modifiers::empty(); } - let mut kinds = ModifierKinds::empty(); + let mut kinds = ModifierKinds::none(); let mut modifiers = self.ast.vec(); while self.at_modifier() { let span = self.start_span(); @@ -393,7 +393,7 @@ impl<'a, C: Config> ParserImpl<'a, C> { let mut has_seen_static_modifier = false; let mut modifiers = None; - let mut modifier_kinds = ModifierKinds::empty(); + let mut modifier_kinds = ModifierKinds::none(); while let Some(modifier) = self.try_parse_modifier( has_seen_static_modifier,