mirror of
https://github.com/oxc-project/oxc.git
synced 2026-09-14 19:36:11 +08:00
c9cd809e50
Pure refactor. Rename `Atom` to `Str`. The name "Atom" is a leftover from when we used to intern strings (years ago), and is misleading now. Just call it `Str`. This follows the naming convention we have for arena-allocated versions of other types e.g. `Box`, `Vec`, `HashMap` - which we name the same as the native equivalents but with a lifetime (`Box<'a>` not `ArenaBox<'a>`, so `Str<'a>` not `ArenaStr<'a>`). Rename all variables that contained "atom", and methods which relate to `Str`s to match the new type name. Rename `as_atom` methods to `as_arena_str`. The longer name is required here to disambiguate from `as_str` methods which return a `&str`. Some variables called "atom" still exist in `oxc_regular_expression` crate - that's a different meaning of "atom" - the meaning defined in regexp spec. The diff of this PR is large but it's 100% renaming. No substantive or unrelated changes whatsoever.
270 lines
6.7 KiB
Rust
270 lines
6.7 KiB
Rust
use std::{
|
|
borrow::{Borrow, Cow},
|
|
fmt, hash,
|
|
ops::Deref,
|
|
};
|
|
|
|
use compact_str::CompactString;
|
|
#[cfg(feature = "serialize")]
|
|
use serde::{Deserialize, Deserializer, Serialize, Serializer};
|
|
|
|
/// Maximum length for inline string, which can be created with [`CompactStr::new_const`].
|
|
pub const MAX_INLINE_LEN: usize = 16;
|
|
|
|
/// Lifetimeless version of [`Str`] which owns its own string data allocation.
|
|
///
|
|
/// [`CompactStr`] is immutable. Use [`CompactStr::into_string`] for a mutable
|
|
/// [`String`].
|
|
///
|
|
/// Currently implemented as just a wrapper around [`compact_str::CompactString`],
|
|
/// but will be reduced in size with a custom implementation later.
|
|
///
|
|
/// [`Str`]: crate::Str
|
|
#[derive(Clone, Eq, PartialOrd, Ord)]
|
|
pub struct CompactStr(CompactString);
|
|
|
|
impl CompactStr {
|
|
/// Create a new [`CompactStr`].
|
|
///
|
|
/// If `&str` is `'static` and no more than [`MAX_INLINE_LEN`] bytes,
|
|
/// prefer [`CompactStr::new_const`] which creates the [`CompactStr`] at
|
|
/// compile time.
|
|
#[inline]
|
|
pub fn new(s: &str) -> Self {
|
|
Self(CompactString::new(s))
|
|
}
|
|
|
|
/// Create a [`CompactStr`] at compile time.
|
|
///
|
|
/// String must be no longer than [`MAX_INLINE_LEN`] bytes.
|
|
///
|
|
/// Prefer this over [`CompactStr::new`] or [`CompactStr::from`] where
|
|
/// string is `'static` and not longer than [`MAX_INLINE_LEN`] bytes.
|
|
///
|
|
/// # Panics
|
|
/// Panics if string is longer than [`MAX_INLINE_LEN`] bytes.
|
|
#[inline]
|
|
pub const fn new_const(s: &'static str) -> Self {
|
|
assert!(s.len() <= MAX_INLINE_LEN);
|
|
Self(CompactString::const_new(s))
|
|
}
|
|
|
|
/// Get string content as a `&str` slice.
|
|
#[inline]
|
|
pub fn as_str(&self) -> &str {
|
|
self.0.as_str()
|
|
}
|
|
|
|
/// Convert a [`CompactStr`] into a [`String`].
|
|
#[inline]
|
|
pub fn into_string(self) -> String {
|
|
self.0.into_string()
|
|
}
|
|
|
|
/// Convert a [`CompactStr`] into a [`CompactString`].
|
|
#[inline]
|
|
pub fn into_compact_string(self) -> CompactString {
|
|
self.0
|
|
}
|
|
|
|
/// Get length of [`CompactStr`].
|
|
#[inline]
|
|
pub fn len(&self) -> usize {
|
|
self.0.len()
|
|
}
|
|
|
|
/// Check if a [`CompactStr`] is empty (0 length).
|
|
#[inline]
|
|
pub fn is_empty(&self) -> bool {
|
|
self.0.is_empty()
|
|
}
|
|
}
|
|
|
|
impl From<&str> for CompactStr {
|
|
fn from(s: &str) -> Self {
|
|
Self(CompactString::from(s))
|
|
}
|
|
}
|
|
|
|
impl From<String> for CompactStr {
|
|
fn from(s: String) -> Self {
|
|
Self(CompactString::from(s))
|
|
}
|
|
}
|
|
|
|
impl From<CompactString> for CompactStr {
|
|
fn from(s: CompactString) -> Self {
|
|
Self(s)
|
|
}
|
|
}
|
|
|
|
impl<'s> From<&'s CompactStr> for Cow<'s, str> {
|
|
fn from(value: &'s CompactStr) -> Self {
|
|
Self::Borrowed(value.as_str())
|
|
}
|
|
}
|
|
|
|
impl From<CompactStr> for Cow<'_, str> {
|
|
fn from(value: CompactStr) -> Self {
|
|
value.0.into()
|
|
}
|
|
}
|
|
impl From<Cow<'_, str>> for CompactStr {
|
|
fn from(value: Cow<'_, str>) -> Self {
|
|
match value {
|
|
Cow::Borrowed(s) => CompactStr::new(s),
|
|
Cow::Owned(s) => CompactStr::from(s),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Deref for CompactStr {
|
|
type Target = str;
|
|
|
|
fn deref(&self) -> &Self::Target {
|
|
self.as_str()
|
|
}
|
|
}
|
|
|
|
impl AsRef<str> for CompactStr {
|
|
fn as_ref(&self) -> &str {
|
|
self.as_str()
|
|
}
|
|
}
|
|
|
|
impl Borrow<str> for CompactStr {
|
|
fn borrow(&self) -> &str {
|
|
self.as_str()
|
|
}
|
|
}
|
|
|
|
impl<T: AsRef<str>> PartialEq<T> for CompactStr {
|
|
fn eq(&self, other: &T) -> bool {
|
|
self.as_str() == other.as_ref()
|
|
}
|
|
}
|
|
|
|
impl PartialEq<CompactStr> for &str {
|
|
fn eq(&self, other: &CompactStr) -> bool {
|
|
*self == other.as_str()
|
|
}
|
|
}
|
|
|
|
impl PartialEq<CompactStr> for str {
|
|
fn eq(&self, other: &CompactStr) -> bool {
|
|
self == other.as_str()
|
|
}
|
|
}
|
|
|
|
impl PartialEq<CompactStr> for Cow<'_, str> {
|
|
fn eq(&self, other: &CompactStr) -> bool {
|
|
self.as_ref() == other.as_str()
|
|
}
|
|
}
|
|
|
|
impl PartialEq<str> for CompactStr {
|
|
fn eq(&self, other: &str) -> bool {
|
|
self.as_str() == other
|
|
}
|
|
}
|
|
|
|
impl hash::Hash for CompactStr {
|
|
fn hash<H: hash::Hasher>(&self, hasher: &mut H) {
|
|
self.as_str().hash(hasher);
|
|
}
|
|
}
|
|
|
|
impl fmt::Debug for CompactStr {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
fmt::Debug::fmt(self.as_str(), f)
|
|
}
|
|
}
|
|
|
|
impl fmt::Display for CompactStr {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
fmt::Display::fmt(self.as_str(), f)
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "serialize")]
|
|
impl Serialize for CompactStr {
|
|
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
|
|
self.as_str().serialize(serializer)
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "serialize")]
|
|
impl<'de> Deserialize<'de> for CompactStr {
|
|
fn deserialize<D: Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
|
|
let compact_string = CompactString::deserialize(deserializer)?;
|
|
Ok(Self(compact_string))
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "schemars")]
|
|
impl schemars::JsonSchema for CompactStr {
|
|
fn is_referenceable() -> bool {
|
|
false
|
|
}
|
|
|
|
fn schema_name() -> std::string::String {
|
|
"String".to_string()
|
|
}
|
|
|
|
fn schema_id() -> Cow<'static, str> {
|
|
Cow::Borrowed("String")
|
|
}
|
|
|
|
fn json_schema(g: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
|
|
<&str>::json_schema(g)
|
|
}
|
|
}
|
|
|
|
/// Creates a `CompactStr` using interpolation of runtime expressions.
|
|
///
|
|
/// The first argument `format_compact_str!` receives is a format string.
|
|
/// This must be a string literal.
|
|
/// The power of the formatting string is in the `{}`s contained.
|
|
///
|
|
/// Additional parameters passed to `format_compact_str!` replace the `{}`s within
|
|
/// the formatting string in the order given unless named or
|
|
/// positional parameters are used; see [`std::fmt`] for more information.
|
|
///
|
|
/// A common use for `format_compact_str!` is concatenation and interpolation
|
|
/// of strings.
|
|
/// The same convention is used with [`print!`] and [`write!`] macros,
|
|
/// depending on the intended destination of the string.
|
|
///
|
|
/// # Panics
|
|
///
|
|
/// `format_compact_str!` panics if a formatting trait implementation returns
|
|
/// an error.
|
|
#[macro_export]
|
|
macro_rules! format_compact_str {
|
|
($($arg:tt)*) => {
|
|
$crate::CompactStr::from($crate::__internal::format_compact!($($arg)*))
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use compact_str::CompactString;
|
|
|
|
use super::CompactStr;
|
|
|
|
#[test]
|
|
fn test_compactstr_eq() {
|
|
let foo = CompactStr::new("foo");
|
|
assert_eq!(foo, "foo");
|
|
assert_eq!(&foo, "foo");
|
|
assert_eq!("foo", foo);
|
|
assert_eq!("foo", &foo);
|
|
assert_eq!(foo.into_compact_string(), CompactString::new("foo"));
|
|
}
|
|
|
|
#[test]
|
|
fn test_format_compact_str() {
|
|
assert_eq!(format_compact_str!("foo{}bar", 123), "foo123bar");
|
|
}
|
|
}
|