Rename ConstFrozenString -> StarlarkStrN

Summary: There's nothing inherently const in `ConstFrozenString`. It is just a full representation of `StarlarkStr`.

Reviewed By: ndmitchell

Differential Revision: D30917477

fbshipit-source-id: 81e0f1cfb50e8524b5146b78dea902081b9f110c

Author: stepancheg

starlark/src/macros/mod.rs

@@ -29,8 +29,7 @@ macro_rules! starlark_type {
         }
         fn get_type_value_static() -> $crate::values::FrozenStringValue {
             const N: usize = $typ.len();
-            static RES: $crate::values::ConstFrozenStringN<N> =
-                $crate::values::ConstFrozenStringN::new($typ);
+            static RES: $crate::values::StarlarkStrN<N> = $crate::values::StarlarkStrN::new($typ);
             RES.erase()
         }
     };

starlark/src/values/layout/constant.rs

@@ -32,13 +32,13 @@ use std::{
 
 /// A constant string that can be converted to a [`FrozenValue`].
 #[repr(C)] // Must match this layout on the heap
-pub struct ConstFrozenStringN<const N: usize> {
+pub struct StarlarkStrN<const N: usize> {
     repr: AValueRepr<StarlarkStr>,
     payload: [u8; N],
 }
 
-impl<const N: usize> ConstFrozenStringN<N> {
-    /// Create a new [`ConstFrozenStringN`] given a string of size `N`.
+impl<const N: usize> StarlarkStrN<N> {
+    /// Create a new [`StarlarkStrN`] given a string of size `N`.
     /// If the string has a different size it will fail.
     pub const fn new(s: &str) -> Self {
         assert!(N == s.len());
@@ -55,7 +55,7 @@ impl<const N: usize> ConstFrozenStringN<N> {
         }
     }
 
-    /// Obtain the [`FrozenValue`] for a [`ConstFrozenStringN`].
+    /// Obtain the [`FrozenValue`] for a [`StarlarkStrN`].
     pub fn unpack(&'static self) -> FrozenValue {
         self.erase().unpack()
     }
@@ -167,13 +167,12 @@ unsafe impl<'v> Trace<'v> for StringValue<'v> {
 macro_rules! const_frozen_string {
     ($s:expr) => {{
         const N: usize = $s.len();
-        static X: starlark::values::ConstFrozenStringN<N> =
-            starlark::values::ConstFrozenStringN::new($s);
+        static X: starlark::values::StarlarkStrN<N> = starlark::values::StarlarkStrN::new($s);
         X.erase()
     }};
 }
 
-pub(crate) static VALUE_EMPTY_STRING: ConstFrozenStringN<0> = ConstFrozenStringN::new("");
+pub(crate) static VALUE_EMPTY_STRING: StarlarkStrN<0> = StarlarkStrN::new("");
 
 #[inline(always)]
 pub(crate) fn constant_string(x: &str) -> Option<FrozenValue> {
@@ -188,133 +187,133 @@ pub(crate) fn constant_string(x: &str) -> Option<FrozenValue> {
     }
 }
 
-pub(crate) static VALUE_BYTE_STRINGS: [ConstFrozenStringN<1>; 128] = [
-    ConstFrozenStringN::new("\x00"),
-    ConstFrozenStringN::new("\x01"),
-    ConstFrozenStringN::new("\x02"),
-    ConstFrozenStringN::new("\x03"),
-    ConstFrozenStringN::new("\x04"),
-    ConstFrozenStringN::new("\x05"),
-    ConstFrozenStringN::new("\x06"),
-    ConstFrozenStringN::new("\x07"),
-    ConstFrozenStringN::new("\x08"),
-    ConstFrozenStringN::new("\x09"),
-    ConstFrozenStringN::new("\x0A"),
-    ConstFrozenStringN::new("\x0B"),
-    ConstFrozenStringN::new("\x0C"),
-    ConstFrozenStringN::new("\x0D"),
-    ConstFrozenStringN::new("\x0E"),
-    ConstFrozenStringN::new("\x0F"),
-    ConstFrozenStringN::new("\x10"),
-    ConstFrozenStringN::new("\x11"),
-    ConstFrozenStringN::new("\x12"),
-    ConstFrozenStringN::new("\x13"),
-    ConstFrozenStringN::new("\x14"),
-    ConstFrozenStringN::new("\x15"),
-    ConstFrozenStringN::new("\x16"),
-    ConstFrozenStringN::new("\x17"),
-    ConstFrozenStringN::new("\x18"),
-    ConstFrozenStringN::new("\x19"),
-    ConstFrozenStringN::new("\x1A"),
-    ConstFrozenStringN::new("\x1B"),
-    ConstFrozenStringN::new("\x1C"),
-    ConstFrozenStringN::new("\x1D"),
-    ConstFrozenStringN::new("\x1E"),
-    ConstFrozenStringN::new("\x1F"),
-    ConstFrozenStringN::new("\x20"),
-    ConstFrozenStringN::new("\x21"),
-    ConstFrozenStringN::new("\x22"),
-    ConstFrozenStringN::new("\x23"),
-    ConstFrozenStringN::new("\x24"),
-    ConstFrozenStringN::new("\x25"),
-    ConstFrozenStringN::new("\x26"),
-    ConstFrozenStringN::new("\x27"),
-    ConstFrozenStringN::new("\x28"),
-    ConstFrozenStringN::new("\x29"),
-    ConstFrozenStringN::new("\x2A"),
-    ConstFrozenStringN::new("\x2B"),
-    ConstFrozenStringN::new("\x2C"),
-    ConstFrozenStringN::new("\x2D"),
-    ConstFrozenStringN::new("\x2E"),
-    ConstFrozenStringN::new("\x2F"),
-    ConstFrozenStringN::new("\x30"),
-    ConstFrozenStringN::new("\x31"),
-    ConstFrozenStringN::new("\x32"),
-    ConstFrozenStringN::new("\x33"),
-    ConstFrozenStringN::new("\x34"),
-    ConstFrozenStringN::new("\x35"),
-    ConstFrozenStringN::new("\x36"),
-    ConstFrozenStringN::new("\x37"),
-    ConstFrozenStringN::new("\x38"),
-    ConstFrozenStringN::new("\x39"),
-    ConstFrozenStringN::new("\x3A"),
-    ConstFrozenStringN::new("\x3B"),
-    ConstFrozenStringN::new("\x3C"),
-    ConstFrozenStringN::new("\x3D"),
-    ConstFrozenStringN::new("\x3E"),
-    ConstFrozenStringN::new("\x3F"),
-    ConstFrozenStringN::new("\x40"),
-    ConstFrozenStringN::new("\x41"),
-    ConstFrozenStringN::new("\x42"),
-    ConstFrozenStringN::new("\x43"),
-    ConstFrozenStringN::new("\x44"),
-    ConstFrozenStringN::new("\x45"),
-    ConstFrozenStringN::new("\x46"),
-    ConstFrozenStringN::new("\x47"),
-    ConstFrozenStringN::new("\x48"),
-    ConstFrozenStringN::new("\x49"),
-    ConstFrozenStringN::new("\x4A"),
-    ConstFrozenStringN::new("\x4B"),
-    ConstFrozenStringN::new("\x4C"),
-    ConstFrozenStringN::new("\x4D"),
-    ConstFrozenStringN::new("\x4E"),
-    ConstFrozenStringN::new("\x4F"),
-    ConstFrozenStringN::new("\x50"),
-    ConstFrozenStringN::new("\x51"),
-    ConstFrozenStringN::new("\x52"),
-    ConstFrozenStringN::new("\x53"),
-    ConstFrozenStringN::new("\x54"),
-    ConstFrozenStringN::new("\x55"),
-    ConstFrozenStringN::new("\x56"),
-    ConstFrozenStringN::new("\x57"),
-    ConstFrozenStringN::new("\x58"),
-    ConstFrozenStringN::new("\x59"),
-    ConstFrozenStringN::new("\x5A"),
-    ConstFrozenStringN::new("\x5B"),
-    ConstFrozenStringN::new("\x5C"),
-    ConstFrozenStringN::new("\x5D"),
-    ConstFrozenStringN::new("\x5E"),
-    ConstFrozenStringN::new("\x5F"),
-    ConstFrozenStringN::new("\x60"),
-    ConstFrozenStringN::new("\x61"),
-    ConstFrozenStringN::new("\x62"),
-    ConstFrozenStringN::new("\x63"),
-    ConstFrozenStringN::new("\x64"),
-    ConstFrozenStringN::new("\x65"),
-    ConstFrozenStringN::new("\x66"),
-    ConstFrozenStringN::new("\x67"),
-    ConstFrozenStringN::new("\x68"),
-    ConstFrozenStringN::new("\x69"),
-    ConstFrozenStringN::new("\x6A"),
-    ConstFrozenStringN::new("\x6B"),
-    ConstFrozenStringN::new("\x6C"),
-    ConstFrozenStringN::new("\x6D"),
-    ConstFrozenStringN::new("\x6E"),
-    ConstFrozenStringN::new("\x6F"),
-    ConstFrozenStringN::new("\x70"),
-    ConstFrozenStringN::new("\x71"),
-    ConstFrozenStringN::new("\x72"),
-    ConstFrozenStringN::new("\x73"),
-    ConstFrozenStringN::new("\x74"),
-    ConstFrozenStringN::new("\x75"),
-    ConstFrozenStringN::new("\x76"),
-    ConstFrozenStringN::new("\x77"),
-    ConstFrozenStringN::new("\x78"),
-    ConstFrozenStringN::new("\x79"),
-    ConstFrozenStringN::new("\x7A"),
-    ConstFrozenStringN::new("\x7B"),
-    ConstFrozenStringN::new("\x7C"),
-    ConstFrozenStringN::new("\x7D"),
-    ConstFrozenStringN::new("\x7E"),
-    ConstFrozenStringN::new("\x7F"),
+pub(crate) static VALUE_BYTE_STRINGS: [StarlarkStrN<1>; 128] = [
+    StarlarkStrN::new("\x00"),
+    StarlarkStrN::new("\x01"),
+    StarlarkStrN::new("\x02"),
+    StarlarkStrN::new("\x03"),
+    StarlarkStrN::new("\x04"),
+    StarlarkStrN::new("\x05"),
+    StarlarkStrN::new("\x06"),
+    StarlarkStrN::new("\x07"),
+    StarlarkStrN::new("\x08"),
+    StarlarkStrN::new("\x09"),
+    StarlarkStrN::new("\x0A"),
+    StarlarkStrN::new("\x0B"),
+    StarlarkStrN::new("\x0C"),
+    StarlarkStrN::new("\x0D"),
+    StarlarkStrN::new("\x0E"),
+    StarlarkStrN::new("\x0F"),
+    StarlarkStrN::new("\x10"),
+    StarlarkStrN::new("\x11"),
+    StarlarkStrN::new("\x12"),
+    StarlarkStrN::new("\x13"),
+    StarlarkStrN::new("\x14"),
+    StarlarkStrN::new("\x15"),
+    StarlarkStrN::new("\x16"),
+    StarlarkStrN::new("\x17"),
+    StarlarkStrN::new("\x18"),
+    StarlarkStrN::new("\x19"),
+    StarlarkStrN::new("\x1A"),
+    StarlarkStrN::new("\x1B"),
+    StarlarkStrN::new("\x1C"),
+    StarlarkStrN::new("\x1D"),
+    StarlarkStrN::new("\x1E"),
+    StarlarkStrN::new("\x1F"),
+    StarlarkStrN::new("\x20"),
+    StarlarkStrN::new("\x21"),
+    StarlarkStrN::new("\x22"),
+    StarlarkStrN::new("\x23"),
+    StarlarkStrN::new("\x24"),
+    StarlarkStrN::new("\x25"),
+    StarlarkStrN::new("\x26"),
+    StarlarkStrN::new("\x27"),
+    StarlarkStrN::new("\x28"),
+    StarlarkStrN::new("\x29"),
+    StarlarkStrN::new("\x2A"),
+    StarlarkStrN::new("\x2B"),
+    StarlarkStrN::new("\x2C"),
+    StarlarkStrN::new("\x2D"),
+    StarlarkStrN::new("\x2E"),
+    StarlarkStrN::new("\x2F"),
+    StarlarkStrN::new("\x30"),
+    StarlarkStrN::new("\x31"),
+    StarlarkStrN::new("\x32"),
+    StarlarkStrN::new("\x33"),
+    StarlarkStrN::new("\x34"),
+    StarlarkStrN::new("\x35"),
+    StarlarkStrN::new("\x36"),
+    StarlarkStrN::new("\x37"),
+    StarlarkStrN::new("\x38"),
+    StarlarkStrN::new("\x39"),
+    StarlarkStrN::new("\x3A"),
+    StarlarkStrN::new("\x3B"),
+    StarlarkStrN::new("\x3C"),
+    StarlarkStrN::new("\x3D"),
+    StarlarkStrN::new("\x3E"),
+    StarlarkStrN::new("\x3F"),
+    StarlarkStrN::new("\x40"),
+    StarlarkStrN::new("\x41"),
+    StarlarkStrN::new("\x42"),
+    StarlarkStrN::new("\x43"),
+    StarlarkStrN::new("\x44"),
+    StarlarkStrN::new("\x45"),
+    StarlarkStrN::new("\x46"),
+    StarlarkStrN::new("\x47"),
+    StarlarkStrN::new("\x48"),
+    StarlarkStrN::new("\x49"),
+    StarlarkStrN::new("\x4A"),
+    StarlarkStrN::new("\x4B"),
+    StarlarkStrN::new("\x4C"),
+    StarlarkStrN::new("\x4D"),
+    StarlarkStrN::new("\x4E"),
+    StarlarkStrN::new("\x4F"),
+    StarlarkStrN::new("\x50"),
+    StarlarkStrN::new("\x51"),
+    StarlarkStrN::new("\x52"),
+    StarlarkStrN::new("\x53"),
+    StarlarkStrN::new("\x54"),
+    StarlarkStrN::new("\x55"),
+    StarlarkStrN::new("\x56"),
+    StarlarkStrN::new("\x57"),
+    StarlarkStrN::new("\x58"),
+    StarlarkStrN::new("\x59"),
+    StarlarkStrN::new("\x5A"),
+    StarlarkStrN::new("\x5B"),
+    StarlarkStrN::new("\x5C"),
+    StarlarkStrN::new("\x5D"),
+    StarlarkStrN::new("\x5E"),
+    StarlarkStrN::new("\x5F"),
+    StarlarkStrN::new("\x60"),
+    StarlarkStrN::new("\x61"),
+    StarlarkStrN::new("\x62"),
+    StarlarkStrN::new("\x63"),
+    StarlarkStrN::new("\x64"),
+    StarlarkStrN::new("\x65"),
+    StarlarkStrN::new("\x66"),
+    StarlarkStrN::new("\x67"),
+    StarlarkStrN::new("\x68"),
+    StarlarkStrN::new("\x69"),
+    StarlarkStrN::new("\x6A"),
+    StarlarkStrN::new("\x6B"),
+    StarlarkStrN::new("\x6C"),
+    StarlarkStrN::new("\x6D"),
+    StarlarkStrN::new("\x6E"),
+    StarlarkStrN::new("\x6F"),
+    StarlarkStrN::new("\x70"),
+    StarlarkStrN::new("\x71"),
+    StarlarkStrN::new("\x72"),
+    StarlarkStrN::new("\x73"),
+    StarlarkStrN::new("\x74"),
+    StarlarkStrN::new("\x75"),
+    StarlarkStrN::new("\x76"),
+    StarlarkStrN::new("\x77"),
+    StarlarkStrN::new("\x78"),
+    StarlarkStrN::new("\x79"),
+    StarlarkStrN::new("\x7A"),
+    StarlarkStrN::new("\x7B"),
+    StarlarkStrN::new("\x7C"),
+    StarlarkStrN::new("\x7D"),
+    StarlarkStrN::new("\x7E"),
+    StarlarkStrN::new("\x7F"),
 ];

starlark/src/values/layout/mod.rs

@@ -28,7 +28,7 @@ mod value;
 mod value_captured;
 
 pub(crate) use constant::StringValueLike;
-pub use constant::{ConstFrozenStringN, FrozenStringValue, StringValue};
+pub use constant::{FrozenStringValue, StarlarkStrN, StringValue};
 pub use heap::{Freezer, FrozenHeap, FrozenHeapRef, Heap, Tracer};
 pub(crate) use pointer_i32::PointerI32;
 pub use value::{FrozenValue, Value};

starlark_derive/src/render.rs

@@ -114,8 +114,8 @@ fn render_fun(x: StarFun) -> TokenStream {
     let set_type = type_attribute.map(|x| {
         quote! {
             const TYPE_N: usize = #x.len();
-            static TYPE: starlark::values::ConstFrozenStringN<TYPE_N> =
-                starlark::values::ConstFrozenStringN::new(#x);
+            static TYPE: starlark::values::StarlarkStrN<TYPE_N> =
+                starlark::values::StarlarkStrN::new(#x);
             func.set_type(TYPE.unpack());
         }
     });