Replace Ident2 with 2-word Cow from beef crate

Author: SpaceManiac

Cargo.lock

@@ -2267,12 +2267,12 @@ impl<'o, 's> AnalyzeProc<'o, 's> {
             },
             Term::String(text) => Analysis::from_value(
                 self.objtree,
-                Constant::String(text.as_str().into()),
+                Constant::String(text.clone().into()),
                 type_hint,
             ),
             Term::Resource(text) => Analysis::from_value(
                 self.objtree,
-                Constant::Resource(text.as_str().into()),
+                Constant::Resource(text.clone().into()),
                 type_hint,
             ),
             Term::As(_) => assumption_set![Assumption::IsNum(true)].into(),
@@ -2960,9 +2960,7 @@ impl<'o, 's> AnalyzeProc<'o, 's> {
                 }
                 typeref.get().pretty_path()
             },
-            StaticType::List { list, .. } => {
-                "list"
-            },
+            StaticType::List { list, .. } => "list",
             StaticType::Proc => return Analysis::empty(),
         };
         error(

crates/dreamchecker/src/lib.rs

@@ -21,6 +21,7 @@ indexmap = "2.6.0"
 derivative = "2.2.0"
 get-size = "0.1.4"
 get-size-derive = "0.1.3"
+beef = "0.5.2"
 
 [dev-dependencies]
 walkdir = "2.5.0"

crates/dreammaker/Cargo.toml

@@ -4,6 +4,7 @@
 use std::fmt;
 use std::iter::FromIterator;
 
+use beef::lean::Cow;
 use get_size::GetSize;
 use get_size_derive::GetSize;
 use phf::phf_map;
@@ -702,13 +703,17 @@ pub type Ident = String;
 // but could be replaced by interning later.
 #[derive(Clone, Eq, PartialEq)]
 pub struct Ident2 {
-    inner: Box<str>,
+    inner: Cow<'static, str>,
 }
 
 impl Ident2 {
     pub fn as_str(&self) -> &str {
         &self.inner
     }
+
+    pub fn into_owned(self) -> String {
+        self.inner.into_owned()
+    }
 }
 
 impl PartialEq<str> for Ident2 {
@@ -717,8 +722,8 @@ impl PartialEq<str> for Ident2 {
     }
 }
 
-impl<'a> From<&'a str> for Ident2 {
-    fn from(v: &'a str) -> Self {
+impl From<&'static str> for Ident2 {
+    fn from(v: &'static str) -> Self {
         Ident2 { inner: v.into() }
     }
 }
@@ -729,12 +734,6 @@ impl From<String> for Ident2 {
     }
 }
 
-impl From<Ident2> for String {
-    fn from(v: Ident2) -> Self {
-        v.inner.into()
-    }
-}
-
 impl std::ops::Deref for Ident2 {
     type Target = str;
     fn deref(&self) -> &str {
@@ -756,7 +755,11 @@ impl fmt::Debug for Ident2 {
 
 impl GetSize for Ident2 {
     fn get_heap_size(&self) -> usize {
-        self.inner.len()
+        if self.inner.is_owned() {
+            self.inner.len()
+        } else {
+            0
+        }
     }
 }
 
@@ -1541,6 +1544,7 @@ pub static VALID_FILTER_FLAGS: phf::Map<&'static str, (&str, bool, bool, &[&str]
 
 // ----------------------------------------------------------------------------
 // Guard against sizeof regression.
+const _: [(); 0 - !(std::mem::size_of::<Ident2>() <= 16) as usize] = [];
 const _: [(); 0 - !(std::mem::size_of::<Statement>() <= 56) as usize] = [];
 const _: [(); 0 - !(std::mem::size_of::<Expression>() <= 32) as usize] = [];
 const _: [(); 0 - !(std::mem::size_of::<Term>() <= 40) as usize] = [];

crates/dreammaker/src/ast.rs

@@ -820,7 +820,7 @@ impl<'a> ConstantFolder<'a> {
 
         match (op, lhs, rhs) {
             (BinaryOp::Add, String(lhs), String(rhs)) => {
-                Ok(String((std::string::String::from(lhs) + &rhs).into()))
+                Ok(String((lhs.into_owned() + &rhs).into()))
             },
             (BinaryOp::Eq, lhs, rhs) => Ok(Constant::from(lhs == rhs)),
             (BinaryOp::NotEq, lhs, rhs) => Ok(Constant::from(lhs != rhs)),
@@ -888,7 +888,7 @@ impl<'a> ConstantFolder<'a> {
                         )));
                     }
                     match args[0].nameof() {
-                        Some(name) => Constant::string(name),
+                        Some(name) => Constant::string(name.to_owned()),
                         None => {
                             return Err(self.error(
                                 "malformed nameof() call, expression appears to have no name",
@@ -1062,7 +1062,7 @@ impl<'a> ConstantFolder<'a> {
         let mut vars = IndexMap::with_hasher(RandomState::default());
         for (k, v) in input {
             // TODO: find a type annotation by looking up 'k' on the prefab's type
-            vars.insert(String::from(k), self.expr(v, None)?);
+            vars.insert(k.into_owned(), self.expr(v, None)?);
         }
         Ok(vars)
     }