Layout histories: resolve rebase conflicts (#2197)

* get things to build

* test changes

* remove unused jkind reason

* fix formatting

Author: alanechang

ocaml/parsing/builtin_attributes.ml

@@ -102,15 +102,11 @@ let builtin_attrs =
   ; "loop"; "ocaml.loop"
   ; "tail_mod_cons"; "ocaml.tail_mod_cons"
   ; "unaliasable"; "ocaml.unaliasable"
-<<<<<<< HEAD
   ; "builtin"; "ocaml.builtin"
   ; "no_effects"; "ocaml.no_effects"
   ; "no_coeffects"; "ocaml.no_coeffects"
-  ; "only_generative_effects"; "ocaml.only_generative_effects";
-||||||| parent of 114ab8b0 (Enable layout histories (#1823))
-=======
+  ; "only_generative_effects"; "ocaml.only_generative_effects"
   ; "error_message"; "ocaml.error_message"
->>>>>>> 114ab8b0 (Enable layout histories (#1823))
   ]
 
 (* nroberts: When we upstream the builtin-attribute whitelisting, we shouldn't

ocaml/parsing/builtin_attributes.mli

@@ -192,7 +192,6 @@ val has_once : Parsetree.attributes -> (bool, unit) result
     [unique_], and [once_] mode annotation attributes from let-bindings to both
     the let-bound expression and its pattern.
 *)
-<<<<<<< HEAD
 val mode_annotation_attributes_filter : Attributes_filter.t
 
 (* CR layouts v1.5: Remove everything except for [Immediate64] and [Immediate]
@@ -209,23 +208,10 @@ val jkind_attribute_of_string : string -> jkind_attribute option
    as the attribute mechanism predates layouts.
 *)
 val jkind : Parsetree.attributes -> jkind_attribute Location.loc option
-||||||| parent of 114ab8b0 (Enable layout histories (#1823))
-(* CR layouts: we should eventually be able to delete ~legacy_immediate (after we
-   turn on layouts by default). *)
-val jkind : legacy_immediate:bool -> Parsetree.attributes ->
-  (Jane_asttypes.jkind_annotation option,
-   Jane_asttypes.jkind_annotation) result
-=======
-(* CR layouts: we should eventually be able to delete ~legacy_immediate (after we
-   turn on layouts by default). *)
-val jkind : legacy_immediate:bool -> Parsetree.attributes ->
-  (Jane_asttypes.jkind_annotation option,
-   Jane_asttypes.jkind_annotation) result
 
 (** Finds the first "error_message" attribute, marks it as used, and returns its
     string payload. Returns [None] if no such attribute is present.
 
     There should be at most one "error_message" attribute, additional ones are sliently
     ignored. **)
 val error_message_attr : Parsetree.attributes -> string option
->>>>>>> 114ab8b0 (Enable layout histories (#1823))

ocaml/testsuite/tests/typing-immediate/immediate.ml

@@ -177,10 +177,8 @@ Line 2, characters 2-38:
 Error: The layout of type t is value, because
          it's a boxed record type.
        But the layout of type t must be a sublayout of immediate, because
-         of the annotation on the declaration of the type t/2.
+         of the annotation on the declaration of the type t.
 |}];;
-(* CR layouts v2.9: Investigate why the "/2" is here and check if it's only limited
-   to expect tests. *)
 
 (* Not guaranteed that t is immediate, so this is an invalid declaration *)
 module C = struct