Merge pull request #2043 from tweag/remove-deprecated-to_json

Don't use deprecated struct methods

Author: mergify[bot]

.bazelrc.common

@@ -15,7 +15,7 @@ common --config common
 startup --host_jvm_args=-Djdk.tls.client.protocols=TLSv1.2
 
 common --incompatible_require_linker_input_cc_api
-
+common --incompatible_struct_has_no_methods
 common --incompatible_disallow_empty_glob=true
 
 # test environment does not propagate locales by default some tests reads files

haskell/cabal.bzl

@@ -559,7 +559,7 @@ def _haskell_cabal_library_impl(ctx):
 
     (_, runghc_manifest) = ctx.resolve_tools(tools = [ctx.attr._runghc])
     json_args = ctx.actions.declare_file("{}_cabal_wrapper_args.json".format(ctx.label.name))
-    ctx.actions.write(json_args, c.args.to_json())
+    ctx.actions.write(json_args, json.encode(c.args))
     ctx.actions.run(
         executable = c.cabal_wrapper,
         arguments = [json_args.path],
@@ -861,7 +861,7 @@ def _haskell_cabal_binary_impl(ctx):
     )
     (_, runghc_manifest) = ctx.resolve_tools(tools = [ctx.attr._runghc])
     json_args = ctx.actions.declare_file("{}_cabal_wrapper_args.json".format(ctx.label.name))
-    ctx.actions.write(json_args, c.args.to_json())
+    ctx.actions.write(json_args, json.encode(c.args))
     ctx.actions.run(
         executable = c.cabal_wrapper,
         arguments = [json_args.path],
@@ -1291,7 +1291,7 @@ library
     )
 
     # Create a stack.yaml capturing user overrides to the snapshot.
-    stack_yaml_content = struct(**{
+    stack_yaml_content = json.encode(struct(**{
         "resolver": str(snapshot),
         "packages": [resolve_package] + core_packages + [
             # Determines path to vendored package's root directory relative to
@@ -1311,7 +1311,7 @@ library
             ])
             for (pkg, flags) in repository_ctx.attr.flags.items()
         },
-    }).to_json()
+    }))
     repository_ctx.file("stack.yaml", content = stack_yaml_content, executable = False)
 
     # We declared core packages as local packages in stack.yaml for two reasons.
@@ -1679,7 +1679,7 @@ def _write_snapshot_json(repository_ctx, all_cabal_hashes, resolved):
             "__GENERATED_FILE_DO_NOT_MODIFY_MANUALLY": checksum,
             "all-cabal-hashes": repr(all_cabal_hashes),
             "resolved": _pretty_print_kvs(1, {
-                name: struct(**spec).to_json()
+                name: json.encode(struct(**spec))
                 for (name, spec) in resolved.items()
             }),
         }),

haskell/private/actions/info.bzl

@@ -31,7 +31,7 @@ def write_proto_file(hs, output_name, proto_type, content):
     """
     proto_txt = hs.actions.declare_file(output_name + ".txt")
     proto_pb = hs.actions.declare_file(output_name + ".pb")
-    hs.actions.write(output = proto_txt, content = content.to_proto())
+    hs.actions.write(output = proto_txt, content = proto.encode_text(content))
 
     protoc = hs.toolchain.protoc
     rule_info_protos = hs.toolchain.rule_info_proto[ProtoInfo].direct_sources