Remove needless line-move noise from the diff

Reviewed the whole diff vs master and reverted reorderings that were not
real changes, so the review shows only the actual edits in place:

- typemod.ml: reverted entirely to master. Its only diff was two report_error
  arms (Cannot_eliminate_dependency, With_changes_module_alias) reordered —
  pure cosmetic churn, both still raised, no content change.
- typecore.ml: moved list_labels/list_labels_aux back to their original spot
  (after type_approx, before check_univars) with the original comment. I had
  re-added them before lower_args when restoring, creating a spurious
  delete+add pair.
- bs_syntaxerr.ml/.mli: restored to master and re-applied only the intended
  change in place — Misplaced_label_syntax had been relocated to the end of
  the error type and pp_error; now it stays in its original position and the
  only diff is the message typo fix ("support" -> "supported"), which the
  fixture already expects.

env.ml/.mli were already byte-identical to master. No behavioral change;
build + format clean, super_errors suite green.

Author: JonoPrest

compiler/frontend/bs_syntaxerr.ml

@@ -26,11 +26,13 @@ type untagged_variant = OnlyOneUnknown | AtMostOneObject | AtMostOneArray
 
 type error =
   | Unsupported_predicates
+  | Conflict_bs_bs_this_bs_meth
   | Duplicated_bs_deriving
   | Conflict_attributes
   | Expect_int_literal
   | Expect_string_literal
   | Expect_int_or_string_or_json_literal
+  | Unhandled_poly_type
   | Invalid_underscore_type_in_external
   | Invalid_bs_string_type
   | Invalid_bs_int_type
@@ -42,15 +44,19 @@ type error =
   *)
   | Not_supported_directive_in_bs_return
   | Expect_opt_in_bs_return_to_opt
+  | Misplaced_label_syntax
   | Optional_in_uncurried_bs_attribute
   | Bs_this_simple_pattern
   | Experimental_feature_not_enabled of Experimental_features.feature
   | LetUnwrap_not_supported_in_position of [`Toplevel | `Unsupported_type]
-  | Misplaced_label_syntax
 
 let pp_error fmt err =
   Format.pp_print_string fmt
     (match err with
+    | Misplaced_label_syntax -> "Label syntax is not supported in this position"
+    (*
+    let fn x = ((##) x ~hi)  ~lo:1 ~hi:2 
+    *)
     | Optional_in_uncurried_bs_attribute ->
       "Uncurried function doesn't support optional arguments yet"
     | Expect_opt_in_bs_return_to_opt ->
@@ -59,12 +65,15 @@ let pp_error fmt err =
     | Not_supported_directive_in_bs_return -> "Not supported return directive"
     | Illegal_attribute -> "Illegal attributes"
     | Unsupported_predicates -> "unsupported predicates"
+    | Conflict_bs_bs_this_bs_meth ->
+      "%@this and %@bs can not be applied at the same time"
     | Duplicated_bs_deriving -> "duplicate @deriving attribute"
     | Conflict_attributes -> "conflicting attributes "
     | Expect_string_literal -> "expect string literal "
     | Expect_int_literal -> "expect int literal "
     | Expect_int_or_string_or_json_literal ->
       "expect int, string literal or json literal {json|text here|json} "
+    | Unhandled_poly_type -> "Unhandled poly type"
     | Invalid_underscore_type_in_external ->
       "_ is not allowed in combination with external optional type"
     | Invalid_bs_string_type -> "Not a valid type for %@string"
@@ -87,8 +96,7 @@ let pp_error fmt err =
       | `Toplevel -> "`let?` is not allowed for top-level bindings."
       | `Unsupported_type ->
         "`let?` is only supported in let bindings targeting the `result` or \
-         `option` type.")
-    | Misplaced_label_syntax -> "Label syntax is not supported in this position")
+         `option` type."))
 
 type exn += Error of Location.t * error
 

compiler/frontend/bs_syntaxerr.mli

@@ -26,11 +26,13 @@ type untagged_variant = OnlyOneUnknown | AtMostOneObject | AtMostOneArray
 
 type error =
   | Unsupported_predicates
+  | Conflict_bs_bs_this_bs_meth
   | Duplicated_bs_deriving
   | Conflict_attributes
   | Expect_int_literal
   | Expect_string_literal
   | Expect_int_or_string_or_json_literal
+  | Unhandled_poly_type
   | Invalid_underscore_type_in_external
   | Invalid_bs_string_type
   | Invalid_bs_int_type
@@ -42,11 +44,11 @@ type error =
   *)
   | Not_supported_directive_in_bs_return
   | Expect_opt_in_bs_return_to_opt
+  | Misplaced_label_syntax
   | Optional_in_uncurried_bs_attribute
   | Bs_this_simple_pattern
   | Experimental_feature_not_enabled of Experimental_features.feature
   | LetUnwrap_not_supported_in_position of [`Toplevel | `Unsupported_type]
-  | Misplaced_label_syntax
 
 val err : Location.t -> error -> 'a
 

compiler/ml/typecore.ml

@@ -1989,6 +1989,19 @@ let rec type_approx env sexp =
     ty2
   | _ -> newvar ()
 
+(* List labels in a function type, and whether return type is a variable *)
+let rec list_labels_aux env visited ls ty_fun =
+  let ty = expand_head env ty_fun in
+  if List.memq ty visited then (List.rev ls, false)
+  else
+    match ty.desc with
+    | Tarrow (arg, ty_res, _, arity) when arity = None || visited = [] ->
+      list_labels_aux env (ty :: visited) (arg.lbl :: ls) ty_res
+    | _ -> (List.rev ls, is_Tvar ty)
+
+let list_labels env ty =
+  wrap_trace_gadt_instances env (list_labels_aux env [] []) ty
+
 (* Check that all univars are safe in a type *)
 let check_univars env expans kind exp ty_expected vars =
   if expans && not (is_nonexpansive exp) then
@@ -2250,18 +2263,6 @@ let is_ignore ~env ~arity funct =
     with Unify _ -> false)
   | _ -> false
 
-let rec list_labels_aux env visited ls ty_fun =
-  let ty = expand_head env ty_fun in
-  if List.memq ty visited then (List.rev ls, false)
-  else
-    match ty.desc with
-    | Tarrow (arg, ty_res, _, arity) when arity = None || visited = [] ->
-      list_labels_aux env (ty :: visited) (arg.lbl :: ls) ty_res
-    | _ -> (List.rev ls, is_Tvar ty)
-
-let list_labels env ty =
-  wrap_trace_gadt_instances env (list_labels_aux env [] []) ty
-
 let rec lower_args env seen ty_fun =
   let ty = expand_head env ty_fun in
   if List.memq ty seen then ()

compiler/ml/typemod.ml

@@ -1818,6 +1818,11 @@ let report_error ppf = function
     fprintf ppf "@[This module is not a functor; it has type@ %a@]" modtype mty
   | Not_included errs ->
     fprintf ppf "@[<v>Signature mismatch:@ %a@]" Includemod.report_error errs
+  | Cannot_eliminate_dependency mty ->
+    fprintf ppf
+      "@[This functor has type@ %a@ The parameter cannot be eliminated in the \
+       result type.@  Bind the argument to a module identifier.@]"
+      modtype mty
   | Signature_expected -> fprintf ppf "This module type is not a signature"
   | Structure_expected mty ->
     fprintf ppf "@[This module is not a structure; it has type@ %a" modtype mty
@@ -1835,16 +1840,16 @@ let report_error ppf = function
       "@[<v>@[This `with' constraint on %a makes the applicative functor @ \
        type %s ill-typed in the constrained signature:@]@ %a@]"
       longident lid (Path.name path) Includemod.report_error explanation
-  | With_cannot_remove_constrained_type ->
-    fprintf ppf
-      "@[<v>Destructive substitutions are not supported for constrained @ \
-       types (other than when replacing a type constructor with @ a type \
-       constructor with the same arguments).@]"
   | With_changes_module_alias (lid, id, path) ->
     fprintf ppf
       "@[<v>@[This `with' constraint on %a changes %s, which is aliased @ in \
        the constrained signature (as %s)@].@]"
       longident lid (Path.name path) (Ident.name id)
+  | With_cannot_remove_constrained_type ->
+    fprintf ppf
+      "@[<v>Destructive substitutions are not supported for constrained @ \
+       types (other than when replacing a type constructor with @ a type \
+       constructor with the same arguments).@]"
   | Repeated_name (kind, name, repeated_loc) ->
     fprintf ppf
       "@[Multiple definition of the %s name %s @ at @{<loc>%a@}@ @ Names must \
@@ -1873,11 +1878,6 @@ let report_error ppf = function
   | Interface_not_compiled intf_name ->
     fprintf ppf "@[Could not find the .cmi file for interface@ %a.@]"
       Location.print_filename intf_name
-  | Cannot_eliminate_dependency mty ->
-    fprintf ppf
-      "@[This functor has type@ %a@ The parameter cannot be eliminated in the \
-       result type.@  Bind the argument to a module identifier.@]"
-      modtype mty
   | Not_allowed_in_functor_body ->
     fprintf ppf "@[This expression creates fresh types.@ %s@]"
       "It is not allowed inside applicative functors."