Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion crates/oxc_parser/src/js/class.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);
Expand Down
4 changes: 2 additions & 2 deletions crates/oxc_parser/src/js/function.rs
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ impl<'a, C: Config> ParserImpl<'a, C> {
ModifierKind::Readonly,
])
} else {
ModifierKinds::empty()
ModifierKinds::none()
};
self.verify_modifiers(
&modifiers,
Expand All @@ -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,
);
Expand Down
4 changes: 2 additions & 2 deletions crates/oxc_parser/src/js/object.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);
Expand Down Expand Up @@ -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,
);
Expand Down
14 changes: 7 additions & 7 deletions crates/oxc_parser/src/modifiers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ impl ModifierKinds {
/// Create a set from an array of modifier kinds.
#[inline]
pub const fn new<const N: usize>(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]);
Expand All @@ -38,7 +38,7 @@ impl ModifierKinds {

/// Empty set (no modifiers).
#[inline]
pub const fn empty() -> Self {
pub const fn none() -> Self {
Self(0)
}

Expand Down Expand Up @@ -182,21 +182,21 @@ 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());
}
}

Self { modifiers, kinds }
}

pub fn empty() -> Self {
Self { modifiers: None, kinds: ModifierKinds::empty() }
Self { modifiers: None, kinds: ModifierKinds::none() }
}

pub fn contains(&self, target: ModifierKind) -> bool {
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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,
Expand Down
Loading