Eliminate SFregex_group shape AST node

vassilmladenov · facebook-github-bot · commit 5b391d628442 · 2025-01-03T22:16:11.000-08:00
Summary: This node represents int keys in shape literals, which is a parse error. We retain the associated type `TSFregex_group` which is created by capture groups in `re`-prefixed strings.

Differential Revision: D67779741

fbshipit-source-id: 0be9a7292be1b6a5982f6222468eafbc3c2537ad
diff --git a/hphp/hack/src/ast/ast_defs.ml b/hphp/hack/src/ast/ast_defs.ml
@@ -29,10 +29,6 @@ and byte_string = string
 and positioned_byte_string = pos * byte_string
 
 and shape_field_name =
-  | SFregex_group of pstring
-      (** TODO(T199271494) Eliminate this group node and its supporting code. It
-       * is conjured by typing for inference of Shapes::idx for regex results,
-       * but is otherwise never emitted. *)
   | SFlit_str of positioned_byte_string
   | SFclassname of id (* nameof C *)
   | SFclass_const of id * pstring (* C::X *)
@@ -349,7 +345,6 @@ module ShapeField = struct
    * we have to write our own compare. *)
   let compare x y =
     match (x, y) with
-    | (SFregex_group (_, s1), SFregex_group (_, s2)) -> String.compare s1 s2
     | (SFlit_str (_, s1), SFlit_str (_, s2)) -> String.compare s1 s2
     | (SFclassname (_, s1), SFclassname (_, s2)) -> String.compare s1 s2
     | (SFclass_const ((_, s1), (_, s1')), SFclass_const ((_, s2), (_, s2'))) ->
@@ -358,27 +353,18 @@ module ShapeField = struct
         ~cmp2:String.compare
         (s1, s1')
         (s2, s2')
-    (* Cross-variant order: SFregex_group, SFlit_str, SFclassname, SFclass_const
+    (* Cross-variant order: SFlit_str, SFclassname, SFclass_const
      *
      * This can be derived provided that we validate a deriver in Rust that is
      * synced to this. Rust also does not have facilities like [@compare.ignore]
      * so we need a special Pos that always compares to 0. *)
-    | (SFregex_group _, SFlit_str _)
-    | (SFregex_group _, SFclassname _)
-    | (SFregex_group _, SFclass_const _) ->
-      -1
-    (* spacing *)
-    | (SFlit_str _, SFregex_group _) -> 1
     | (SFlit_str _, SFclassname _)
     | (SFlit_str _, SFclass_const _) ->
       -1
     (* spacing *)
-    | (SFclassname _, SFregex_group _)
-    | (SFclassname _, SFlit_str _) ->
-      1
+    | (SFclassname _, SFlit_str _) -> 1
     | (SFclassname _, SFclass_const _) -> -1
     (* spacing *)
-    | (SFclass_const _, SFregex_group _)
     | (SFclass_const _, SFlit_str _)
     | (SFclass_const _, SFclassname _) ->
       1
diff --git a/hphp/hack/src/client/ide_service/code_actions_services/refactors/flip_around_comma.ml b/hphp/hack/src/client/ide_service/code_actions_services/refactors/flip_around_comma.ml
@@ -79,7 +79,6 @@ let pos_of_expr = Tuple3.get2
 let pos_of_shape_field_name =
   Ast_defs.(
     function
-    | SFregex_group (pos, _) -> pos
     | SFlit_str (pos, _) -> pos
     | SFclassname (pos, _) -> pos
     | SFclass_const (_, (pos, _)) -> pos)
diff --git a/hphp/hack/src/decl/direct_decl_smart_constructors.rs b/hphp/hack/src/decl/direct_decl_smart_constructors.rs
@@ -2254,9 +2254,6 @@ impl<'a, 'o, 't, S: SourceTextAllocator<'t, 'a>> DirectDeclSmartConstructors<'a,
 
     fn make_t_shape_field_name(&self, ShapeField(field): &ShapeField<'a>) -> TShapeField<'a> {
         TShapeField(match field {
-            ShapeFieldName::SFregexGroup(&(pos, x)) => {
-                TshapeFieldName::TSFregexGroup(self.alloc(PosString(pos, x)))
-            }
             ShapeFieldName::SFlitStr(&(pos, x)) => {
                 TshapeFieldName::TSFlitStr(self.alloc(PosByteString(pos, x)))
             }
diff --git a/hphp/hack/src/elab/passes/validate_shape_name.rs b/hphp/hack/src/elab/passes/validate_shape_name.rs
@@ -30,41 +30,3 @@ fn error_if_duplicate_names(flds: &[(ShapeFieldName, Expr)], env: &Env) {
         seen.insert(name);
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use nast::Expr;
-    use nast::Pos;
-    use oxidized::typechecker_options::TypecheckerOptions;
-
-    use super::*;
-    use crate::env::ProgramSpecificOptions;
-
-    fn mk_shape_lit_int_field_name(name: &str) -> ShapeFieldName {
-        ShapeFieldName::SFregexGroup((Pos::NONE, name.to_string()))
-    }
-
-    fn mk_shape(flds: Vec<(ShapeFieldName, Expr)>) -> Expr {
-        Expr((), Pos::NONE, Expr_::Shape(flds))
-    }
-
-    #[test]
-    fn test_duplicate_field_names() {
-        let env = Env::new(
-            &TypecheckerOptions::default(),
-            &ProgramSpecificOptions::default(),
-        );
-        let f = mk_shape_lit_int_field_name("foo");
-        let mut shape = mk_shape(vec![
-            (f.clone(), elab_utils::expr::null()),
-            (f, elab_utils::expr::null()),
-        ]);
-        shape.transform(&env, &mut ValidateShapeNamePass);
-        assert!(matches!(
-            &env.into_errors()[..],
-            [NamingPhaseError::Naming(
-                NamingError::FieldNameAlreadyBound { .. }
-            )]
-        ));
-    }
-}
diff --git a/hphp/hack/src/hackc/emitter/constant_folder.rs b/hphp/hack/src/hackc/emitter/constant_folder.rs
@@ -220,18 +220,6 @@ fn shape_to_typed_value(
         .iter()
         .map(|(sf, expr)| {
             let key = match sf {
-                ast_defs::ShapeFieldName::SFregexGroup((_, s)) => {
-                    let tv = int_expr_to_typed_value(s)?;
-                    match tv {
-                        TypedValue::Int(_) => tv,
-                        _ => {
-                            return Err(Error::unrecoverable(format!(
-                                "{} is not a valid integer index",
-                                s
-                            )));
-                        }
-                    }
-                }
                 ast_defs::ShapeFieldName::SFlitStr(id) => TypedValue::intern_string(&id.1),
                 ast_defs::ShapeFieldName::SFclassname(class_id) => nameof_to_typed_value(
                     emitter,
diff --git a/hphp/hack/src/hackc/emitter/emit_expression.rs b/hphp/hack/src/hackc/emitter/emit_expression.rs
@@ -1106,7 +1106,6 @@ fn extract_shape_field_name_pstring<'a>(
 ) -> Result<ast::Expr_> {
     use ast_defs::ShapeFieldName as SF;
     Ok(match field {
-        SF::SFregexGroup(s) => ast::Expr_::mk_int(s.1.clone()),
         SF::SFlitStr(s) => ast::Expr_::mk_string(s.1.clone()),
         SF::SFclassname(id) => {
             ast::Expr_::mk_nameof(ast::ClassId((), pos.clone(), ast::ClassId_::CI(id.clone())))
diff --git a/hphp/hack/src/hackc/emitter/emit_property.rs b/hphp/hack/src/hackc/emitter/emit_property.rs
@@ -251,9 +251,7 @@ fn expr_requires_deep_init(ast::Expr(_, _, expr): &ast::Expr, force_class_init:
 
 fn shape_field_requires_deep_init((name, expr): &(ast_defs::ShapeFieldName, ast::Expr)) -> bool {
     match name {
-        ast_defs::ShapeFieldName::SFregexGroup(_) | ast_defs::ShapeFieldName::SFlitStr(_) => {
-            expr_requires_deep_init_(expr)
-        }
+        ast_defs::ShapeFieldName::SFlitStr(_) => expr_requires_deep_init_(expr),
         ast_defs::ShapeFieldName::SFclassname(_) => false, // dynamic names are banned
         ast_defs::ShapeFieldName::SFclassConst(ast_defs::Id(_, s), (_, p)) => {
             class_const_requires_deep_init(s, p)
diff --git a/hphp/hack/src/hackc/emitter/emit_type_constant.rs b/hphp/hack/src/hackc/emitter/emit_type_constant.rs
@@ -105,7 +105,6 @@ fn is_prim_or_resolved_classname(kind: TypeStructureKind) -> bool {
 fn shape_field_name(sf: &ShapeFieldName) -> (String, bool) {
     use oxidized::ast_defs::Id;
     match sf {
-        ShapeFieldName::SFregexGroup((_, s)) => (s.to_string(), false),
         ShapeFieldName::SFlitStr((_, s)) => {
             (
                 // FIXME: This is not safe--string literals are binary strings.
diff --git a/hphp/hack/src/hackc/emitter/emit_type_hint.rs b/hphp/hack/src/hackc/emitter/emit_type_hint.rs
@@ -128,7 +128,6 @@ pub fn fmt_hint(tparams: &[&str], strip_tparams: bool, hint: &Hint) -> Result<St
         //  TODO: Check whether shape fields need to retain order *)
         Hshape(NastShapeInfo { field_map, .. }) => {
             let fmt_field_name = |name: &ShapeFieldName| match name {
-                ShapeFieldName::SFregexGroup((_, s)) => s.to_owned(),
                 ShapeFieldName::SFlitStr((_, s)) => format!("'{}'", s),
                 ShapeFieldName::SFclassname(Id(_, cid)) => {
                     format!("'{}'", fmt_name_or_prim(tparams, cid))
diff --git a/hphp/hack/src/hackc/print_expr/print.rs b/hphp/hack/src/hackc/print_expr/print.rs
@@ -293,7 +293,6 @@ fn print_expr(
     ) -> Result<()> {
         use ast::ShapeFieldName as S;
         match field {
-            S::SFregexGroup((_, s)) => print_expr_int(w, s.as_ref()),
             S::SFlitStr((_, s)) => print_expr_string(w, s),
             S::SFclassname(id) => write::wrap_by(w, "\"", |w| print_expr_id(w, env, id.1.as_ref())),
             // TODO(T204024412) This is broken, it loses info about the class
diff --git a/hphp/hack/src/naming/elaborate_namespaces_visitor.rs b/hphp/hack/src/naming/elaborate_namespaces_visitor.rs
@@ -518,7 +518,7 @@ impl<'ast> VisitorMut<'ast> for ElaborateNamespacesVisitor {
         sfn: &mut ShapeFieldName,
     ) -> Result<(), ()> {
         match sfn {
-            ShapeFieldName::SFregexGroup(_) | ShapeFieldName::SFlitStr(_) => {}
+            ShapeFieldName::SFlitStr(_) => {}
             ShapeFieldName::SFclassname(id) | ShapeFieldName::SFclassConst(id, _) => {
                 env.elaborate_type_name(id);
             }
diff --git a/hphp/hack/src/naming/naming_elaborate_namespaces_endo.ml b/hphp/hack/src/naming/naming_elaborate_namespaces_endo.ml
@@ -446,9 +446,7 @@ class ['a, 'b, 'c, 'd] generic_elaborator =
 
     method! on_shape_field_name env sfn =
       match sfn with
-      | SFregex_group _
-      | SFlit_str _ ->
-        sfn
+      | SFlit_str _ -> sfn
       | SFclassname x -> SFclassname (elaborate_type_name env x)
       | SFclass_const (x, (pos, y)) ->
         let x = elaborate_type_name env x in
diff --git a/hphp/hack/src/oxidized/aast_visitor/node_impl_gen.rs b/hphp/hack/src/oxidized/aast_visitor/node_impl_gen.rs
@@ -3,7 +3,7 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the "hack" directory of this source tree.
 //
-// @generated SignedSource<<32fd0eaf8929514a05b82b7f61385838>>
+// @generated SignedSource<<be5239b7154f181abb07f72d9a81c79e>>
 //
 // To regenerate this file, run:
 //   hphp/hack/src/oxidized_regen.sh
@@ -1974,7 +1974,6 @@ impl<P: Params> Node<P> for ShapeFieldName {
         v: &mut dyn Visitor<'node, Params = P>,
     ) -> Result<(), P::Error> {
         match self {
-            ShapeFieldName::SFregexGroup(a0) => a0.accept(c, v),
             ShapeFieldName::SFlitStr(a0) => a0.accept(c, v),
             ShapeFieldName::SFclassname(a0) => a0.accept(c, v),
             ShapeFieldName::SFclassConst(a0, a1) => {
diff --git a/hphp/hack/src/oxidized/aast_visitor/node_mut_impl_gen.rs b/hphp/hack/src/oxidized/aast_visitor/node_mut_impl_gen.rs
@@ -3,7 +3,7 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the "hack" directory of this source tree.
 //
-// @generated SignedSource<<ff990ef043e3d5f310bac240791bed0b>>
+// @generated SignedSource<<a6fd611464aef830cc5be61bac77fae2>>
 //
 // To regenerate this file, run:
 //   hphp/hack/src/oxidized_regen.sh
@@ -1974,7 +1974,6 @@ impl<P: Params> NodeMut<P> for ShapeFieldName {
         v: &mut dyn VisitorMut<'node, Params = P>,
     ) -> Result<(), P::Error> {
         match self {
-            ShapeFieldName::SFregexGroup(a0) => a0.accept(c, v),
             ShapeFieldName::SFlitStr(a0) => a0.accept(c, v),
             ShapeFieldName::SFclassname(a0) => a0.accept(c, v),
             ShapeFieldName::SFclassConst(a0, a1) => {
diff --git a/hphp/hack/src/oxidized/gen/ast_defs.rs b/hphp/hack/src/oxidized/gen/ast_defs.rs
@@ -3,7 +3,7 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the "hack" directory of this source tree.
 //
-// @generated SignedSource<<35efe35b930e7969a6eb39b236c85625>>
+// @generated SignedSource<<51dd33892d0007914f4f12040c0135a7>>
 //
 // To regenerate this file, run:
 //   hphp/hack/src/oxidized_regen.sh
@@ -71,11 +71,6 @@ pub type PositionedByteString = (Pos, bstr::BString);
 #[rust_to_ocaml(attr = "transform.opaque")]
 #[repr(C, u8)]
 pub enum ShapeFieldName {
-    /// TODO(T199271494) Eliminate this group node and its supporting code. It
-    /// is conjured by typing for inference of Shapes::idx for regex results,
-    /// but is otherwise never emitted.
-    #[rust_to_ocaml(name = "SFregex_group")]
-    SFregexGroup(Pstring),
     #[rust_to_ocaml(name = "SFlit_str")]
     SFlitStr(PositionedByteString),
     SFclassname(Id),
diff --git a/hphp/hack/src/oxidized/impl_gen/ast_defs_impl_gen.rs b/hphp/hack/src/oxidized/impl_gen/ast_defs_impl_gen.rs
@@ -3,17 +3,14 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the "hack" directory of this source tree.
 //
-// @generated SignedSource<<48697de1f55638c3e384724c5a9e0f1a>>
+// @generated SignedSource<<a001e45ffcee1e6281490628ff723cf6>>
 //
 // To regenerate this file, run:
 //   hphp/hack/src/oxidized_regen.sh
 
 #![allow(clippy::all)]
 use crate::ast_defs::*;
 impl ShapeFieldName {
-    pub fn mk_sfregex_group(p0: Pstring) -> Self {
-        ShapeFieldName::SFregexGroup(p0)
-    }
     pub fn mk_sflit_str(p0: PositionedByteString) -> Self {
         ShapeFieldName::SFlitStr(p0)
     }
@@ -23,12 +20,6 @@ impl ShapeFieldName {
     pub fn mk_sfclass_const(p0: Id, p1: Pstring) -> Self {
         ShapeFieldName::SFclassConst(p0, p1)
     }
-    pub fn is_sfregex_group(&self) -> bool {
-        match self {
-            ShapeFieldName::SFregexGroup(..) => true,
-            _ => false,
-        }
-    }
     pub fn is_sflit_str(&self) -> bool {
         match self {
             ShapeFieldName::SFlitStr(..) => true,
@@ -47,12 +38,6 @@ impl ShapeFieldName {
             _ => false,
         }
     }
-    pub fn as_sfregex_group(&self) -> Option<&Pstring> {
-        match self {
-            ShapeFieldName::SFregexGroup(p0) => Some(p0),
-            _ => None,
-        }
-    }
     pub fn as_sflit_str(&self) -> Option<&PositionedByteString> {
         match self {
             ShapeFieldName::SFlitStr(p0) => Some(p0),
@@ -71,12 +56,6 @@ impl ShapeFieldName {
             _ => None,
         }
     }
-    pub fn as_sfregex_group_mut(&mut self) -> Option<&mut Pstring> {
-        match self {
-            ShapeFieldName::SFregexGroup(p0) => Some(p0),
-            _ => None,
-        }
-    }
     pub fn as_sflit_str_mut(&mut self) -> Option<&mut PositionedByteString> {
         match self {
             ShapeFieldName::SFlitStr(p0) => Some(p0),
@@ -95,12 +74,6 @@ impl ShapeFieldName {
             _ => None,
         }
     }
-    pub fn as_sfregex_group_into(self) -> Option<Pstring> {
-        match self {
-            ShapeFieldName::SFregexGroup(p0) => Some(p0),
-            _ => None,
-        }
-    }
     pub fn as_sflit_str_into(self) -> Option<PositionedByteString> {
         match self {
             ShapeFieldName::SFlitStr(p0) => Some(p0),
diff --git a/hphp/hack/src/oxidized/manual/shape_map.rs b/hphp/hack/src/oxidized/manual/shape_map.rs
@@ -20,27 +20,19 @@ impl Ord for ShapeField {
     fn cmp(&self, other: &Self) -> Ordering {
         use ShapeFieldName as SFN;
         match (&self.0, &other.0) {
-            (SFN::SFregexGroup((_, s1)), SFN::SFregexGroup((_, s2))) => s1.cmp(s2),
             (SFN::SFlitStr((_, s1)), SFN::SFlitStr((_, s2))) => s1.cmp(s2),
             (SFN::SFclassname(Id(_, s1)), SFN::SFclassname(Id(_, s2))) => s1.cmp(s2),
             (SFN::SFclassConst(Id(_, c1), (_, m1)), SFN::SFclassConst(Id(_, c2), (_, m2))) => {
                 (c1, m1).cmp(&(c2, m2))
             }
 
-            (SFN::SFregexGroup(_), SFN::SFlitStr(_))
-            | (SFN::SFregexGroup(_), SFN::SFclassname(_))
-            | (SFN::SFregexGroup(_), SFN::SFclassConst(_, _)) => Ordering::Less,
-
-            (SFN::SFlitStr(_), SFN::SFregexGroup(_)) => Ordering::Greater,
             (SFN::SFlitStr(_), SFN::SFclassname(_))
             | (SFN::SFlitStr(_), SFN::SFclassConst(_, _)) => Ordering::Less,
 
-            (SFN::SFclassname(_), SFN::SFregexGroup(_))
-            | (SFN::SFclassname(_), SFN::SFlitStr(_)) => Ordering::Greater,
+            (SFN::SFclassname(_), SFN::SFlitStr(_)) => Ordering::Greater,
             (SFN::SFclassname(_), SFN::SFclassConst(_, _)) => Ordering::Less,
 
-            (SFN::SFclassConst(_, _), SFN::SFregexGroup(_))
-            | (SFN::SFclassConst(_, _), SFN::SFlitStr(_))
+            (SFN::SFclassConst(_, _), SFN::SFlitStr(_))
             | (SFN::SFclassConst(_, _), SFN::SFclassname(_)) => Ordering::Greater,
         }
     }
diff --git a/hphp/hack/src/oxidized_by_ref/gen/ast_defs.rs b/hphp/hack/src/oxidized_by_ref/gen/ast_defs.rs
@@ -3,7 +3,7 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the "hack" directory of this source tree.
 //
-// @generated SignedSource<<d1c3aa1851788902f152c1cb8f1272d6>>
+// @generated SignedSource<<c8dd49cadfe65563c7c5e296accfbd53>>
 //
 // To regenerate this file, run:
 //   hphp/hack/src/oxidized_regen.sh
@@ -78,12 +78,6 @@ pub type PositionedByteString<'a> = (&'a Pos<'a>, &'a bstr::BStr);
 #[rust_to_ocaml(attr = "transform.opaque")]
 #[repr(C, u8)]
 pub enum ShapeFieldName<'a> {
-    /// TODO(T199271494) Eliminate this group node and its supporting code. It
-    /// is conjured by typing for inference of Shapes::idx for regex results,
-    /// but is otherwise never emitted.
-    #[serde(deserialize_with = "arena_deserializer::arena", borrow)]
-    #[rust_to_ocaml(name = "SFregex_group")]
-    SFregexGroup(&'a Pstring<'a>),
     #[serde(deserialize_with = "arena_deserializer::arena", borrow)]
     #[rust_to_ocaml(name = "SFlit_str")]
     SFlitStr(&'a PositionedByteString<'a>),
diff --git a/hphp/hack/src/oxidized_by_ref/manual/shape_map.rs b/hphp/hack/src/oxidized_by_ref/manual/shape_map.rs
@@ -36,27 +36,19 @@ impl<'a> Ord for ShapeField<'a> {
     fn cmp(&self, other: &Self) -> Ordering {
         use ShapeFieldName::*;
         match (&self.0, &other.0) {
-            (SFregexGroup((_, s1)), SFregexGroup((_, s2))) => s1.cmp(s2),
             (SFlitStr((_, s1)), SFlitStr((_, s2))) => s1.cmp(s2),
             (SFclassname(Id(_, s1)), SFclassname(Id(_, s2))) => s1.cmp(s2),
             (SFclassConst((Id(_, c1), (_, m1))), SFclassConst((Id(_, c2), (_, m2)))) => {
                 (c1, m1).cmp(&(c2, m2))
             }
 
-            (SFregexGroup(_), SFlitStr(_))
-            | (SFregexGroup(_), SFclassname(_))
-            | (SFregexGroup(_), SFclassConst(_)) => Ordering::Less,
-
-            (SFlitStr(_), SFregexGroup(_)) => Ordering::Greater,
             (SFlitStr(_), SFclassname(_)) // spacing
             | (SFlitStr(_), SFclassConst(_)) => Ordering::Less,
 
-            (SFclassname(_), SFregexGroup(_)) // spacing
-            | (SFclassname(_), SFlitStr(_)) => Ordering::Greater,
+            (SFclassname(_), SFlitStr(_)) => Ordering::Greater,
             (SFclassname(_), SFclassConst(_)) => Ordering::Less,
 
-            (SFclassConst(_), SFregexGroup(_))
-            | (SFclassConst(_), SFlitStr(_))
+            (SFclassConst(_), SFlitStr(_))
             | (SFclassConst(_), SFclassname(_)) => Ordering::Greater,
         }
     }
diff --git a/hphp/hack/src/parser/lowerer/lowerer.rs b/hphp/hack/src/parser/lowerer/lowerer.rs
diff --git a/hphp/hack/src/typing/hint_print.ml b/hphp/hack/src/typing/hint_print.ml
diff --git a/hphp/hack/src/typing/nast_check/shape_name_check.ml b/hphp/hack/src/typing/nast_check/shape_name_check.ml
diff --git a/hphp/hack/src/typing/typing_defs_core.ml b/hphp/hack/src/typing/typing_defs_core.ml
diff --git a/hphp/hack/src/typing/typing_regex.ml b/hphp/hack/src/typing/typing_regex.ml
diff --git a/hphp/hack/src/typing/typing_shapes.ml b/hphp/hack/src/typing/typing_shapes.ml
diff --git a/hphp/hack/src/typing/write_symbol_info/pretty.ml b/hphp/hack/src/typing/write_symbol_info/pretty.ml

Original file line number	Diff line number	Diff line change
`@@ -2254,9 +2254,6 @@ impl<'a, 'o, 't, S: SourceTextAllocator<'t, 'a>> DirectDeclSmartConstructors<'a,`
`2254`	`2254`
`2255`	`2255`	`fn make_t_shape_field_name(&self, ShapeField(field): &ShapeField<'a>) -> TShapeField<'a> {`
`2256`	`2256`	`TShapeField(match field {`
`2257`		`- ShapeFieldName::SFregexGroup(&(pos, x)) => {`
`2258`		`- TshapeFieldName::TSFregexGroup(self.alloc(PosString(pos, x)))`
`2259`		`- }`
`2260`	`2257`	`ShapeFieldName::SFlitStr(&(pos, x)) => {`
`2261`	`2258`	`TshapeFieldName::TSFlitStr(self.alloc(PosByteString(pos, x)))`
`2262`	`2259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,6 @@ fn is_prim_or_resolved_classname(kind: TypeStructureKind) -> bool {`
`105`	`105`	`fn shape_field_name(sf: &ShapeFieldName) -> (String, bool) {`
`106`	`106`	`use oxidized::ast_defs::Id;`
`107`	`107`	`match sf {`
`108`		`- ShapeFieldName::SFregexGroup((_, s)) => (s.to_string(), false),`
`109`	`108`	`ShapeFieldName::SFlitStr((_, s)) => {`
`110`	`109`	`(`
`111`	`110`	`// FIXME: This is not safe--string literals are binary strings.`