From c1689bb0513916bb39709ba7eac6c889949c07a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 23 Aug 2022 16:02:16 +0100 Subject: [PATCH] all: use txtar filename extensions consistently MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is more accorate than the generic ".txt" extension. The latest testscript version supports this switch, and in fact it now prefers the explicit extension. The update drops errgo.v2 from the module graph, which helps #1872. Signed-off-by: Daniel Martí Change-Id: I2fc1a108af6cd4544a00d0ffc3f334b5bbd6c720 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/542611 Reviewed-by: Roger Peppe Unity-Result: CUEcueckoo TryBot-Result: CUEcueckoo --- README.md | 2 +- cmd/cue/cmd/script_test.go | 4 ++-- ...t_blah_v1.0.0.txt => externalmod.test_blah_v1.0.0.txtar} | 0 .../cmd/testdata/script/{cmd_after.txt => cmd_after.txtar} | 0 .../script/{cmd_baddisplay.txt => cmd_baddisplay.txtar} | 0 .../testdata/script/{cmd_closed.txt => cmd_closed.txtar} | 0 .../script/{cmd_concurrent.txt => cmd_concurrent.txtar} | 0 cmd/cue/cmd/testdata/script/{cmd_dep.txt => cmd_dep.txtar} | 0 .../script/{cmd_dep_cycle.txt => cmd_dep_cycle.txtar} | 0 .../testdata/script/{cmd_deppkg.txt => cmd_deppkg.txtar} | 0 cmd/cue/cmd/testdata/script/{cmd_dir.txt => cmd_dir.txtar} | 0 .../cmd/testdata/script/{cmd_echo.txt => cmd_echo.txtar} | 0 .../cmd/testdata/script/{cmd_embed.txt => cmd_embed.txtar} | 0 cmd/cue/cmd/testdata/script/{cmd_env.txt => cmd_env.txtar} | 0 cmd/cue/cmd/testdata/script/{cmd_err.txt => cmd_err.txtar} | 0 .../testdata/script/{cmd_errcode.txt => cmd_errcode.txtar} | 0 .../testdata/script/{cmd_errpos.txt => cmd_errpos.txtar} | 0 .../script/{cmd_filetypes.txt => cmd_filetypes.txtar} | 0 .../cmd/testdata/script/{cmd_func.txt => cmd_func.txtar} | 0 .../cmd/testdata/script/{cmd_http.txt => cmd_http.txtar} | 0 .../testdata/script/{cmd_import.txt => cmd_import.txtar} | 0 .../script/{cmd_inferred.txt => cmd_inferred.txtar} | 0 .../script/{cmd_issue1405.txt => cmd_issue1405.txtar} | 0 .../script/{cmd_issue650.txt => cmd_issue650.txtar} | 0 .../testdata/script/{cmd_jsonpb.txt => cmd_jsonpb.txtar} | 0 .../script/{cmd_mkdirtmp.txt => cmd_mkdirtmp.txtar} | 0 .../testdata/script/{cmd_notool.txt => cmd_notool.txtar} | 0 .../testdata/script/{cmd_notool2.txt => cmd_notool2.txtar} | 0 .../cmd/testdata/script/{cmd_print.txt => cmd_print.txtar} | 0 cmd/cue/cmd/testdata/script/{cmd_ref.txt => cmd_ref.txtar} | 0 cmd/cue/cmd/testdata/script/{cmd_run.txt => cmd_run.txtar} | 0 .../script/{cmd_run_list.txt => cmd_run_list.txtar} | 0 .../cmd/testdata/script/{cmd_stdin.txt => cmd_stdin.txtar} | 0 .../cmd/testdata/script/{cmd_tags.txt => cmd_tags.txtar} | 0 .../script/{cmd_textproto.txt => cmd_textproto.txtar} | 0 .../cmd/testdata/script/{def_basic.txt => def_basic.txtar} | 0 .../cmd/testdata/script/{def_force.txt => def_force.txtar} | 0 .../testdata/script/{def_inline.txt => def_inline.txtar} | 0 .../script/{def_jsonschema.txt => def_jsonschema.txtar} | 0 .../testdata/script/{def_openapi.txt => def_openapi.txtar} | 0 .../cmd/testdata/script/{def_proto.txt => def_proto.txtar} | 0 .../script/{eval_concrete.txt => eval_concrete.txtar} | 0 .../script/{eval_context.txt => eval_context.txtar} | 0 .../script/{eval_datapkg.txt => eval_datapkg.txtar} | 0 cmd/cue/cmd/testdata/script/{eval_e.txt => eval_e.txtar} | 0 .../script/{eval_e_hidden.txt => eval_e_hidden.txtar} | 0 .../cmd/testdata/script/{eval_errs.txt => eval_errs.txtar} | 0 .../cmd/testdata/script/{eval_expr.txt => eval_expr.txtar} | 0 .../testdata/script/{eval_flags.txt => eval_flags.txtar} | 0 .../testdata/script/{eval_force.txt => eval_force.txtar} | 0 .../testdata/script/{eval_hidden.txt => eval_hidden.txtar} | 0 .../script/{eval_hiddenfail.txt => eval_hiddenfail.txtar} | 0 .../testdata/script/{eval_import.txt => eval_import.txtar} | 0 .../script/{eval_loaderr.txt => eval_loaderr.txtar} | 0 .../{eval_mixedfiletypes.txt => eval_mixedfiletypes.txtar} | 0 .../script/{eval_newline.txt => eval_newline.txtar} | 0 .../{eval_notexistfatal.txt => eval_notexistfatal.txtar} | 0 ...notexistincomplete.txt => eval_notexistincomplete.txtar} | 0 .../cmd/testdata/script/{eval_rec.txt => eval_rec.txtar} | 0 .../script/{eval_resolve.txt => eval_resolve.txtar} | 0 .../testdata/script/{eval_stdin.txt => eval_stdin.txtar} | 0 .../cmd/testdata/script/{eval_tags.txt => eval_tags.txtar} | 0 .../cmd/testdata/script/{eval_tool.txt => eval_tool.txtar} | 0 cmd/cue/cmd/testdata/script/{export.txt => export.txtar} | 0 .../{export_defaulterr.txt => export_defaulterr.txtar} | 0 .../testdata/script/{export_err.txt => export_err.txtar} | 0 .../testdata/script/{export_expr.txt => export_expr.txtar} | 0 .../script/{export_force.txt => export_force.txtar} | 0 .../{export_incomplete.txt => export_incomplete.txtar} | 0 .../testdata/script/{export_list.txt => export_list.txtar} | 0 .../script/{export_select.txt => export_select.txtar} | 0 .../testdata/script/{export_yaml.txt => export_yaml.txtar} | 0 .../testdata/script/{file_forms.txt => file_forms.txtar} | 0 cmd/cue/cmd/testdata/script/{fix.txt => fix.txtar} | 0 .../cmd/testdata/script/{fix_files.txt => fix_files.txtar} | 0 cmd/cue/cmd/testdata/script/{fix_pkg.txt => fix_pkg.txtar} | 0 cmd/cue/cmd/testdata/script/{fmt.txt => fmt.txtar} | 0 cmd/cue/cmd/testdata/script/{fmt_err.txt => fmt_err.txtar} | 0 .../script/{fmt_issue1553.txt => fmt_issue1553.txtar} | 0 .../cmd/testdata/script/{fmt_multi.txt => fmt_multi.txtar} | 0 .../cmd/testdata/script/{fmt_stdin.txt => fmt_stdin.txtar} | 0 .../testdata/script/{get_go_anon.txt => get_go_anon.txtar} | 0 .../script/{get_go_bad_embed.txt => get_go_bad_embed.txtar} | 0 .../script/{get_go_local.txt => get_go_local.txtar} | 0 .../script/{get_go_non_local.txt => get_go_non_local.txtar} | 0 .../{get_go_type_errors.txt => get_go_type_errors.txtar} | 0 .../script/{get_go_types.txt => get_go_types.txtar} | 0 ...lvable_package.txt => get_go_unresolvable_package.txtar} | 0 cmd/cue/cmd/testdata/script/{go_cmd.txt => go_cmd.txtar} | 0 .../testdata/script/{goproxytest.txt => goproxytest.txtar} | 0 cmd/cue/cmd/testdata/script/{help.txt => help.txtar} | 0 .../cmd/testdata/script/{help_cmd.txt => help_cmd.txtar} | 0 .../script/{help_cmd_flags.txt => help_cmd_flags.txtar} | 0 .../cmd/testdata/script/{help_doc.txt => help_doc.txtar} | 0 .../testdata/script/{help_hello.txt => help_hello.txtar} | 0 cmd/cue/cmd/testdata/script/{hidden.txt => hidden.txtar} | 0 .../testdata/script/{import_auto.txt => import_auto.txtar} | 0 .../script/{import_binary.txt => import_binary.txtar} | 0 .../script/{import_context.txt => import_context.txtar} | 0 .../testdata/script/{import_dir.txt => import_dir.txtar} | 0 .../script/{import_files.txt => import_files.txtar} | 0 .../script/{import_hoiststr.txt => import_hoiststr.txtar} | 0 .../testdata/script/{import_list.txt => import_list.txtar} | 0 .../script/{import_match.txt => import_match.txtar} | 0 .../script/{import_merge.txt => import_merge.txtar} | 0 .../testdata/script/{import_path.txt => import_path.txtar} | 0 .../script/{import_proto.txt => import_proto.txtar} | 0 .../script/{import_proto2.txt => import_proto2.txtar} | 0 cmd/cue/cmd/testdata/script/{inject.txt => inject.txtar} | 0 .../cmd/testdata/script/{injecterr.txt => injecterr.txtar} | 0 cmd/cue/cmd/testdata/script/{install.txt => install.txtar} | 0 ...{install_contributing.txt => install_contributing.txtar} | 0 .../cmd/testdata/script/{issue116.txt => issue116.txtar} | 0 .../cmd/testdata/script/{issue1270.txt => issue1270.txtar} | 0 .../cmd/testdata/script/{issue174.txt => issue174.txtar} | 0 .../cmd/testdata/script/{issue217.txt => issue217.txtar} | 0 .../cmd/testdata/script/{issue236.txt => issue236.txtar} | 0 .../cmd/testdata/script/{issue269.txt => issue269.txtar} | 0 .../cmd/testdata/script/{issue289.txt => issue289.txtar} | 0 .../cmd/testdata/script/{issue302.txt => issue302.txtar} | 0 .../cmd/testdata/script/{issue303.txt => issue303.txtar} | 0 .../cmd/testdata/script/{issue304.txt => issue304.txtar} | 0 .../cmd/testdata/script/{issue312.txt => issue312.txtar} | 0 .../cmd/testdata/script/{issue315.txt => issue315.txtar} | 0 .../cmd/testdata/script/{issue322.txt => issue322.txtar} | 0 .../cmd/testdata/script/{issue324.txt => issue324.txtar} | 0 .../cmd/testdata/script/{issue398.txt => issue398.txtar} | 0 .../cmd/testdata/script/{issue425.txt => issue425.txtar} | 0 .../cmd/testdata/script/{issue461.txt => issue461.txtar} | 0 .../cmd/testdata/script/{issue473.txt => issue473.txtar} | 0 .../cmd/testdata/script/{issue476.txt => issue476.txtar} | 0 .../cmd/testdata/script/{issue477.txt => issue477.txtar} | 0 .../cmd/testdata/script/{issue512.txt => issue512.txtar} | 0 .../cmd/testdata/script/{issue520.txt => issue520.txtar} | 0 .../cmd/testdata/script/{issue525.txt => issue525.txtar} | 0 .../cmd/testdata/script/{issue526.txt => issue526.txtar} | 0 .../cmd/testdata/script/{issue749.txt => issue749.txtar} | 0 .../cmd/testdata/script/{issue986.txt => issue986.txtar} | 0 .../cmd/testdata/script/{load_pkg.txt => load_pkg.txtar} | 0 .../{merge_interaction.txt => merge_interaction.txtar} | 0 .../script/{no_read_stdin.txt => no_read_stdin.txtar} | 0 .../cmd/testdata/script/{toolonly.txt => toolonly.txtar} | 0 cmd/cue/cmd/testdata/script/{trim.txt => trim.txtar} | 0 .../testdata/script/{trim_force.txt => trim_force.txtar} | 0 cmd/cue/cmd/testdata/script/{version.txt => version.txtar} | 0 cmd/cue/cmd/testdata/script/{vet.txt => vet.txtar} | 0 .../testdata/script/{vet_altdata.txt => vet_altdata.txtar} | 0 .../script/{vet_concrete.txt => vet_concrete.txtar} | 0 .../cmd/testdata/script/{vet_data.txt => vet_data.txtar} | 0 .../script/{vet_disjunction.txt => vet_disjunction.txtar} | 0 .../cmd/testdata/script/{vet_embed.txt => vet_embed.txtar} | 0 .../cmd/testdata/script/{vet_expr.txt => vet_expr.txtar} | 0 .../cmd/testdata/script/{vet_file.txt => vet_file.txtar} | 0 cmd/cue/cmd/testdata/script/{vet_opt.txt => vet_opt.txtar} | 0 .../cmd/testdata/script/{vet_path.txt => vet_path.txtar} | 0 .../cmd/testdata/script/{vet_yaml.txt => vet_yaml.txtar} | 0 doc/contribute.md | 2 +- doc/install.md | 2 +- .../basics/0_intro/{10_json.txt => 10_json.txtarar} | 0 doc/tutorial/basics/0_intro/{20_cue.txt => 20_cue.txtar} | 0 .../0_intro/{30_duplicates.txt => 30_duplicates.txtar} | 0 .../0_intro/{40_constraints.txt => 40_constraints.txtar} | 0 .../basics/0_intro/{43_schema.txt => 43_schema.txtar} | 0 .../0_intro/{47_validation.txt => 47_validation.txtar} | 0 .../basics/0_intro/{50_order.txt => 50_order.txtar} | 0 doc/tutorial/basics/0_intro/{55_fold.txt => 55_fold.txtar} | 0 .../0_intro/{80_boilerplate.txt => 80_boilerplate.txtar} | 0 .../basics/2_types/{05_types.txt => 05_types.txtar} | 0 .../basics/2_types/{20_bottom.txt => 20_bottom.txtar} | 0 .../basics/2_types/{30_numbers.txt => 30_numbers.txtar} | 0 .../basics/2_types/{40_stringlit.txt => 40_stringlit.txtar} | 0 .../basics/2_types/{45_stringraw.txt => 45_stringraw.txtar} | 0 .../basics/2_types/{48_bytes.txt => 48_bytes.txtar} | 0 .../basics/2_types/{50_closed.txt => 50_closed.txtar} | 0 doc/tutorial/basics/2_types/{55_defs.txt => 55_defs.txtar} | 0 .../basics/2_types/{56_optional.txt => 56_optional.txtar} | 0 .../2_types/{60_disjunctions.txt => 60_disjunctions.txtar} | 0 .../basics/2_types/{65_defaults.txt => 65_defaults.txtar} | 0 .../basics/2_types/{65_sumstruct.txt => 65_sumstruct.txtar} | 0 .../basics/2_types/{70_bounds.txt => 70_bounds.txtar} | 0 .../basics/2_types/{75_bounddef.txt => 75_bounddef.txtar} | 0 .../basics/2_types/{80_lists.txt => 80_lists.txtar} | 0 .../basics/2_types/{90_templates.txt => 90_templates.txtar} | 0 .../basics/4_references/{10_scopes.txt => 10_scopes.txtar} | 0 .../4_references/{20_selectors.txt => 20_selectors.txtar} | 0 .../4_references/{30_aliases.txt => 30_aliases.txtar} | 0 .../basics/4_references/{50_emit.txt => 50_emit.txtar} | 0 .../basics/4_references/{80_cycle.txt => 80_cycle.txtar} | 0 .../4_references/{85_cycleref.txt => 85_cycleref.txtar} | 0 .../basics/4_references/{99_hidden.txt => 99_hidden.txtar} | 0 .../6_expressions/{10_operators.txt => 10_operators.txtar} | 0 .../{20_interpolation.txt => 20_interpolation.txtar} | 0 .../{25_interpolfield.txt => 25_interpolfield.txtar} | 0 .../6_expressions/{40_listcomp.txt => 40_listcomp.txtar} | 0 .../6_expressions/{50_fieldcomp.txt => 50_fieldcomp.txtar} | 0 .../{55_conditional.txt => 55_conditional.txtar} | 0 .../basics/6_expressions/{70_regexp.txt => 70_regexp.txtar} | 0 .../6_expressions/{80_coalesce.txt => 80_coalesce.txtar} | 0 .../8_packages/{10_packages.txt => 10_packages.txtar} | 0 .../basics/8_packages/{30_imports.txt => 30_imports.txtar} | 0 doc/tutorial/basics/script_test.go | 2 +- go.mod | 4 ++-- go.sum | 6 ++---- 203 files changed, 10 insertions(+), 12 deletions(-) rename cmd/cue/cmd/testdata/mod/{externalmod.test_blah_v1.0.0.txt => externalmod.test_blah_v1.0.0.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_after.txt => cmd_after.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_baddisplay.txt => cmd_baddisplay.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_closed.txt => cmd_closed.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_concurrent.txt => cmd_concurrent.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_dep.txt => cmd_dep.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_dep_cycle.txt => cmd_dep_cycle.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_deppkg.txt => cmd_deppkg.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_dir.txt => cmd_dir.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_echo.txt => cmd_echo.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_embed.txt => cmd_embed.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_env.txt => cmd_env.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_err.txt => cmd_err.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_errcode.txt => cmd_errcode.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_errpos.txt => cmd_errpos.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_filetypes.txt => cmd_filetypes.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_func.txt => cmd_func.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_http.txt => cmd_http.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_import.txt => cmd_import.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_inferred.txt => cmd_inferred.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_issue1405.txt => cmd_issue1405.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_issue650.txt => cmd_issue650.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_jsonpb.txt => cmd_jsonpb.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_mkdirtmp.txt => cmd_mkdirtmp.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_notool.txt => cmd_notool.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_notool2.txt => cmd_notool2.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_print.txt => cmd_print.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_ref.txt => cmd_ref.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_run.txt => cmd_run.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_run_list.txt => cmd_run_list.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_stdin.txt => cmd_stdin.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_tags.txt => cmd_tags.txtar} (100%) rename cmd/cue/cmd/testdata/script/{cmd_textproto.txt => cmd_textproto.txtar} (100%) rename cmd/cue/cmd/testdata/script/{def_basic.txt => def_basic.txtar} (100%) rename cmd/cue/cmd/testdata/script/{def_force.txt => def_force.txtar} (100%) rename cmd/cue/cmd/testdata/script/{def_inline.txt => def_inline.txtar} (100%) rename cmd/cue/cmd/testdata/script/{def_jsonschema.txt => def_jsonschema.txtar} (100%) rename cmd/cue/cmd/testdata/script/{def_openapi.txt => def_openapi.txtar} (100%) rename cmd/cue/cmd/testdata/script/{def_proto.txt => def_proto.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_concrete.txt => eval_concrete.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_context.txt => eval_context.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_datapkg.txt => eval_datapkg.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_e.txt => eval_e.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_e_hidden.txt => eval_e_hidden.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_errs.txt => eval_errs.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_expr.txt => eval_expr.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_flags.txt => eval_flags.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_force.txt => eval_force.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_hidden.txt => eval_hidden.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_hiddenfail.txt => eval_hiddenfail.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_import.txt => eval_import.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_loaderr.txt => eval_loaderr.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_mixedfiletypes.txt => eval_mixedfiletypes.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_newline.txt => eval_newline.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_notexistfatal.txt => eval_notexistfatal.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_notexistincomplete.txt => eval_notexistincomplete.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_rec.txt => eval_rec.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_resolve.txt => eval_resolve.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_stdin.txt => eval_stdin.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_tags.txt => eval_tags.txtar} (100%) rename cmd/cue/cmd/testdata/script/{eval_tool.txt => eval_tool.txtar} (100%) rename cmd/cue/cmd/testdata/script/{export.txt => export.txtar} (100%) rename cmd/cue/cmd/testdata/script/{export_defaulterr.txt => export_defaulterr.txtar} (100%) rename cmd/cue/cmd/testdata/script/{export_err.txt => export_err.txtar} (100%) rename cmd/cue/cmd/testdata/script/{export_expr.txt => export_expr.txtar} (100%) rename cmd/cue/cmd/testdata/script/{export_force.txt => export_force.txtar} (100%) rename cmd/cue/cmd/testdata/script/{export_incomplete.txt => export_incomplete.txtar} (100%) rename cmd/cue/cmd/testdata/script/{export_list.txt => export_list.txtar} (100%) rename cmd/cue/cmd/testdata/script/{export_select.txt => export_select.txtar} (100%) rename cmd/cue/cmd/testdata/script/{export_yaml.txt => export_yaml.txtar} (100%) rename cmd/cue/cmd/testdata/script/{file_forms.txt => file_forms.txtar} (100%) rename cmd/cue/cmd/testdata/script/{fix.txt => fix.txtar} (100%) rename cmd/cue/cmd/testdata/script/{fix_files.txt => fix_files.txtar} (100%) rename cmd/cue/cmd/testdata/script/{fix_pkg.txt => fix_pkg.txtar} (100%) rename cmd/cue/cmd/testdata/script/{fmt.txt => fmt.txtar} (100%) rename cmd/cue/cmd/testdata/script/{fmt_err.txt => fmt_err.txtar} (100%) rename cmd/cue/cmd/testdata/script/{fmt_issue1553.txt => fmt_issue1553.txtar} (100%) rename cmd/cue/cmd/testdata/script/{fmt_multi.txt => fmt_multi.txtar} (100%) rename cmd/cue/cmd/testdata/script/{fmt_stdin.txt => fmt_stdin.txtar} (100%) rename cmd/cue/cmd/testdata/script/{get_go_anon.txt => get_go_anon.txtar} (100%) rename cmd/cue/cmd/testdata/script/{get_go_bad_embed.txt => get_go_bad_embed.txtar} (100%) rename cmd/cue/cmd/testdata/script/{get_go_local.txt => get_go_local.txtar} (100%) rename cmd/cue/cmd/testdata/script/{get_go_non_local.txt => get_go_non_local.txtar} (100%) rename cmd/cue/cmd/testdata/script/{get_go_type_errors.txt => get_go_type_errors.txtar} (100%) rename cmd/cue/cmd/testdata/script/{get_go_types.txt => get_go_types.txtar} (100%) rename cmd/cue/cmd/testdata/script/{get_go_unresolvable_package.txt => get_go_unresolvable_package.txtar} (100%) rename cmd/cue/cmd/testdata/script/{go_cmd.txt => go_cmd.txtar} (100%) rename cmd/cue/cmd/testdata/script/{goproxytest.txt => goproxytest.txtar} (100%) rename cmd/cue/cmd/testdata/script/{help.txt => help.txtar} (100%) rename cmd/cue/cmd/testdata/script/{help_cmd.txt => help_cmd.txtar} (100%) rename cmd/cue/cmd/testdata/script/{help_cmd_flags.txt => help_cmd_flags.txtar} (100%) rename cmd/cue/cmd/testdata/script/{help_doc.txt => help_doc.txtar} (100%) rename cmd/cue/cmd/testdata/script/{help_hello.txt => help_hello.txtar} (100%) rename cmd/cue/cmd/testdata/script/{hidden.txt => hidden.txtar} (100%) rename cmd/cue/cmd/testdata/script/{import_auto.txt => import_auto.txtar} (100%) rename cmd/cue/cmd/testdata/script/{import_binary.txt => import_binary.txtar} (100%) rename cmd/cue/cmd/testdata/script/{import_context.txt => import_context.txtar} (100%) rename cmd/cue/cmd/testdata/script/{import_dir.txt => import_dir.txtar} (100%) rename cmd/cue/cmd/testdata/script/{import_files.txt => import_files.txtar} (100%) rename cmd/cue/cmd/testdata/script/{import_hoiststr.txt => import_hoiststr.txtar} (100%) rename cmd/cue/cmd/testdata/script/{import_list.txt => import_list.txtar} (100%) rename cmd/cue/cmd/testdata/script/{import_match.txt => import_match.txtar} (100%) rename cmd/cue/cmd/testdata/script/{import_merge.txt => import_merge.txtar} (100%) rename cmd/cue/cmd/testdata/script/{import_path.txt => import_path.txtar} (100%) rename cmd/cue/cmd/testdata/script/{import_proto.txt => import_proto.txtar} (100%) rename cmd/cue/cmd/testdata/script/{import_proto2.txt => import_proto2.txtar} (100%) rename cmd/cue/cmd/testdata/script/{inject.txt => inject.txtar} (100%) rename cmd/cue/cmd/testdata/script/{injecterr.txt => injecterr.txtar} (100%) rename cmd/cue/cmd/testdata/script/{install.txt => install.txtar} (100%) rename cmd/cue/cmd/testdata/script/{install_contributing.txt => install_contributing.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue116.txt => issue116.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue1270.txt => issue1270.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue174.txt => issue174.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue217.txt => issue217.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue236.txt => issue236.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue269.txt => issue269.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue289.txt => issue289.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue302.txt => issue302.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue303.txt => issue303.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue304.txt => issue304.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue312.txt => issue312.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue315.txt => issue315.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue322.txt => issue322.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue324.txt => issue324.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue398.txt => issue398.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue425.txt => issue425.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue461.txt => issue461.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue473.txt => issue473.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue476.txt => issue476.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue477.txt => issue477.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue512.txt => issue512.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue520.txt => issue520.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue525.txt => issue525.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue526.txt => issue526.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue749.txt => issue749.txtar} (100%) rename cmd/cue/cmd/testdata/script/{issue986.txt => issue986.txtar} (100%) rename cmd/cue/cmd/testdata/script/{load_pkg.txt => load_pkg.txtar} (100%) rename cmd/cue/cmd/testdata/script/{merge_interaction.txt => merge_interaction.txtar} (100%) rename cmd/cue/cmd/testdata/script/{no_read_stdin.txt => no_read_stdin.txtar} (100%) rename cmd/cue/cmd/testdata/script/{toolonly.txt => toolonly.txtar} (100%) rename cmd/cue/cmd/testdata/script/{trim.txt => trim.txtar} (100%) rename cmd/cue/cmd/testdata/script/{trim_force.txt => trim_force.txtar} (100%) rename cmd/cue/cmd/testdata/script/{version.txt => version.txtar} (100%) rename cmd/cue/cmd/testdata/script/{vet.txt => vet.txtar} (100%) rename cmd/cue/cmd/testdata/script/{vet_altdata.txt => vet_altdata.txtar} (100%) rename cmd/cue/cmd/testdata/script/{vet_concrete.txt => vet_concrete.txtar} (100%) rename cmd/cue/cmd/testdata/script/{vet_data.txt => vet_data.txtar} (100%) rename cmd/cue/cmd/testdata/script/{vet_disjunction.txt => vet_disjunction.txtar} (100%) rename cmd/cue/cmd/testdata/script/{vet_embed.txt => vet_embed.txtar} (100%) rename cmd/cue/cmd/testdata/script/{vet_expr.txt => vet_expr.txtar} (100%) rename cmd/cue/cmd/testdata/script/{vet_file.txt => vet_file.txtar} (100%) rename cmd/cue/cmd/testdata/script/{vet_opt.txt => vet_opt.txtar} (100%) rename cmd/cue/cmd/testdata/script/{vet_path.txt => vet_path.txtar} (100%) rename cmd/cue/cmd/testdata/script/{vet_yaml.txt => vet_yaml.txtar} (100%) rename doc/tutorial/basics/0_intro/{10_json.txt => 10_json.txtarar} (100%) rename doc/tutorial/basics/0_intro/{20_cue.txt => 20_cue.txtar} (100%) rename doc/tutorial/basics/0_intro/{30_duplicates.txt => 30_duplicates.txtar} (100%) rename doc/tutorial/basics/0_intro/{40_constraints.txt => 40_constraints.txtar} (100%) rename doc/tutorial/basics/0_intro/{43_schema.txt => 43_schema.txtar} (100%) rename doc/tutorial/basics/0_intro/{47_validation.txt => 47_validation.txtar} (100%) rename doc/tutorial/basics/0_intro/{50_order.txt => 50_order.txtar} (100%) rename doc/tutorial/basics/0_intro/{55_fold.txt => 55_fold.txtar} (100%) rename doc/tutorial/basics/0_intro/{80_boilerplate.txt => 80_boilerplate.txtar} (100%) rename doc/tutorial/basics/2_types/{05_types.txt => 05_types.txtar} (100%) rename doc/tutorial/basics/2_types/{20_bottom.txt => 20_bottom.txtar} (100%) rename doc/tutorial/basics/2_types/{30_numbers.txt => 30_numbers.txtar} (100%) rename doc/tutorial/basics/2_types/{40_stringlit.txt => 40_stringlit.txtar} (100%) rename doc/tutorial/basics/2_types/{45_stringraw.txt => 45_stringraw.txtar} (100%) rename doc/tutorial/basics/2_types/{48_bytes.txt => 48_bytes.txtar} (100%) rename doc/tutorial/basics/2_types/{50_closed.txt => 50_closed.txtar} (100%) rename doc/tutorial/basics/2_types/{55_defs.txt => 55_defs.txtar} (100%) rename doc/tutorial/basics/2_types/{56_optional.txt => 56_optional.txtar} (100%) rename doc/tutorial/basics/2_types/{60_disjunctions.txt => 60_disjunctions.txtar} (100%) rename doc/tutorial/basics/2_types/{65_defaults.txt => 65_defaults.txtar} (100%) rename doc/tutorial/basics/2_types/{65_sumstruct.txt => 65_sumstruct.txtar} (100%) rename doc/tutorial/basics/2_types/{70_bounds.txt => 70_bounds.txtar} (100%) rename doc/tutorial/basics/2_types/{75_bounddef.txt => 75_bounddef.txtar} (100%) rename doc/tutorial/basics/2_types/{80_lists.txt => 80_lists.txtar} (100%) rename doc/tutorial/basics/2_types/{90_templates.txt => 90_templates.txtar} (100%) rename doc/tutorial/basics/4_references/{10_scopes.txt => 10_scopes.txtar} (100%) rename doc/tutorial/basics/4_references/{20_selectors.txt => 20_selectors.txtar} (100%) rename doc/tutorial/basics/4_references/{30_aliases.txt => 30_aliases.txtar} (100%) rename doc/tutorial/basics/4_references/{50_emit.txt => 50_emit.txtar} (100%) rename doc/tutorial/basics/4_references/{80_cycle.txt => 80_cycle.txtar} (100%) rename doc/tutorial/basics/4_references/{85_cycleref.txt => 85_cycleref.txtar} (100%) rename doc/tutorial/basics/4_references/{99_hidden.txt => 99_hidden.txtar} (100%) rename doc/tutorial/basics/6_expressions/{10_operators.txt => 10_operators.txtar} (100%) rename doc/tutorial/basics/6_expressions/{20_interpolation.txt => 20_interpolation.txtar} (100%) rename doc/tutorial/basics/6_expressions/{25_interpolfield.txt => 25_interpolfield.txtar} (100%) rename doc/tutorial/basics/6_expressions/{40_listcomp.txt => 40_listcomp.txtar} (100%) rename doc/tutorial/basics/6_expressions/{50_fieldcomp.txt => 50_fieldcomp.txtar} (100%) rename doc/tutorial/basics/6_expressions/{55_conditional.txt => 55_conditional.txtar} (100%) rename doc/tutorial/basics/6_expressions/{70_regexp.txt => 70_regexp.txtar} (100%) rename doc/tutorial/basics/6_expressions/{80_coalesce.txt => 80_coalesce.txtar} (100%) rename doc/tutorial/basics/8_packages/{10_packages.txt => 10_packages.txtar} (100%) rename doc/tutorial/basics/8_packages/{30_imports.txt => 30_imports.txtar} (100%) diff --git a/README.md b/README.md index 54de5aaf8f3..ae3c4355b8b 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ brew install cue-lang/tap/cue #### Install from Source - + If you already have Go 1.16 or later installed, the short version is: diff --git a/cmd/cue/cmd/script_test.go b/cmd/cue/cmd/script_test.go index 0ac176b7926..517e72ec395 100644 --- a/cmd/cue/cmd/script_test.go +++ b/cmd/cue/cmd/script_test.go @@ -52,7 +52,7 @@ func TestLatest(t *testing.T) { if err != nil { return err } - if !strings.HasSuffix(fullpath, ".txt") || + if !strings.HasSuffix(fullpath, ".txtar") || strings.HasPrefix(filepath.Base(fullpath), "fix") { return nil } @@ -124,7 +124,7 @@ func TestScript(t *testing.T) { // Usage Comment out t.Skip() and set file to test. func TestX(t *testing.T) { t.Skip() - const path = "./testdata/script/eval_e.txt" + const path = "./testdata/script/eval_e.txtar" check := func(err error) { t.Helper() diff --git a/cmd/cue/cmd/testdata/mod/externalmod.test_blah_v1.0.0.txt b/cmd/cue/cmd/testdata/mod/externalmod.test_blah_v1.0.0.txtar similarity index 100% rename from cmd/cue/cmd/testdata/mod/externalmod.test_blah_v1.0.0.txt rename to cmd/cue/cmd/testdata/mod/externalmod.test_blah_v1.0.0.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_after.txt b/cmd/cue/cmd/testdata/script/cmd_after.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_after.txt rename to cmd/cue/cmd/testdata/script/cmd_after.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_baddisplay.txt b/cmd/cue/cmd/testdata/script/cmd_baddisplay.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_baddisplay.txt rename to cmd/cue/cmd/testdata/script/cmd_baddisplay.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_closed.txt b/cmd/cue/cmd/testdata/script/cmd_closed.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_closed.txt rename to cmd/cue/cmd/testdata/script/cmd_closed.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_concurrent.txt b/cmd/cue/cmd/testdata/script/cmd_concurrent.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_concurrent.txt rename to cmd/cue/cmd/testdata/script/cmd_concurrent.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_dep.txt b/cmd/cue/cmd/testdata/script/cmd_dep.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_dep.txt rename to cmd/cue/cmd/testdata/script/cmd_dep.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_dep_cycle.txt b/cmd/cue/cmd/testdata/script/cmd_dep_cycle.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_dep_cycle.txt rename to cmd/cue/cmd/testdata/script/cmd_dep_cycle.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_deppkg.txt b/cmd/cue/cmd/testdata/script/cmd_deppkg.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_deppkg.txt rename to cmd/cue/cmd/testdata/script/cmd_deppkg.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_dir.txt b/cmd/cue/cmd/testdata/script/cmd_dir.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_dir.txt rename to cmd/cue/cmd/testdata/script/cmd_dir.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_echo.txt b/cmd/cue/cmd/testdata/script/cmd_echo.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_echo.txt rename to cmd/cue/cmd/testdata/script/cmd_echo.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_embed.txt b/cmd/cue/cmd/testdata/script/cmd_embed.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_embed.txt rename to cmd/cue/cmd/testdata/script/cmd_embed.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_env.txt b/cmd/cue/cmd/testdata/script/cmd_env.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_env.txt rename to cmd/cue/cmd/testdata/script/cmd_env.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_err.txt b/cmd/cue/cmd/testdata/script/cmd_err.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_err.txt rename to cmd/cue/cmd/testdata/script/cmd_err.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_errcode.txt b/cmd/cue/cmd/testdata/script/cmd_errcode.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_errcode.txt rename to cmd/cue/cmd/testdata/script/cmd_errcode.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_errpos.txt b/cmd/cue/cmd/testdata/script/cmd_errpos.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_errpos.txt rename to cmd/cue/cmd/testdata/script/cmd_errpos.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_filetypes.txt b/cmd/cue/cmd/testdata/script/cmd_filetypes.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_filetypes.txt rename to cmd/cue/cmd/testdata/script/cmd_filetypes.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_func.txt b/cmd/cue/cmd/testdata/script/cmd_func.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_func.txt rename to cmd/cue/cmd/testdata/script/cmd_func.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_http.txt b/cmd/cue/cmd/testdata/script/cmd_http.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_http.txt rename to cmd/cue/cmd/testdata/script/cmd_http.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_import.txt b/cmd/cue/cmd/testdata/script/cmd_import.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_import.txt rename to cmd/cue/cmd/testdata/script/cmd_import.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_inferred.txt b/cmd/cue/cmd/testdata/script/cmd_inferred.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_inferred.txt rename to cmd/cue/cmd/testdata/script/cmd_inferred.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_issue1405.txt b/cmd/cue/cmd/testdata/script/cmd_issue1405.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_issue1405.txt rename to cmd/cue/cmd/testdata/script/cmd_issue1405.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_issue650.txt b/cmd/cue/cmd/testdata/script/cmd_issue650.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_issue650.txt rename to cmd/cue/cmd/testdata/script/cmd_issue650.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_jsonpb.txt b/cmd/cue/cmd/testdata/script/cmd_jsonpb.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_jsonpb.txt rename to cmd/cue/cmd/testdata/script/cmd_jsonpb.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_mkdirtmp.txt b/cmd/cue/cmd/testdata/script/cmd_mkdirtmp.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_mkdirtmp.txt rename to cmd/cue/cmd/testdata/script/cmd_mkdirtmp.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_notool.txt b/cmd/cue/cmd/testdata/script/cmd_notool.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_notool.txt rename to cmd/cue/cmd/testdata/script/cmd_notool.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_notool2.txt b/cmd/cue/cmd/testdata/script/cmd_notool2.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_notool2.txt rename to cmd/cue/cmd/testdata/script/cmd_notool2.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_print.txt b/cmd/cue/cmd/testdata/script/cmd_print.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_print.txt rename to cmd/cue/cmd/testdata/script/cmd_print.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_ref.txt b/cmd/cue/cmd/testdata/script/cmd_ref.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_ref.txt rename to cmd/cue/cmd/testdata/script/cmd_ref.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_run.txt b/cmd/cue/cmd/testdata/script/cmd_run.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_run.txt rename to cmd/cue/cmd/testdata/script/cmd_run.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_run_list.txt b/cmd/cue/cmd/testdata/script/cmd_run_list.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_run_list.txt rename to cmd/cue/cmd/testdata/script/cmd_run_list.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_stdin.txt b/cmd/cue/cmd/testdata/script/cmd_stdin.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_stdin.txt rename to cmd/cue/cmd/testdata/script/cmd_stdin.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_tags.txt b/cmd/cue/cmd/testdata/script/cmd_tags.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_tags.txt rename to cmd/cue/cmd/testdata/script/cmd_tags.txtar diff --git a/cmd/cue/cmd/testdata/script/cmd_textproto.txt b/cmd/cue/cmd/testdata/script/cmd_textproto.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/cmd_textproto.txt rename to cmd/cue/cmd/testdata/script/cmd_textproto.txtar diff --git a/cmd/cue/cmd/testdata/script/def_basic.txt b/cmd/cue/cmd/testdata/script/def_basic.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/def_basic.txt rename to cmd/cue/cmd/testdata/script/def_basic.txtar diff --git a/cmd/cue/cmd/testdata/script/def_force.txt b/cmd/cue/cmd/testdata/script/def_force.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/def_force.txt rename to cmd/cue/cmd/testdata/script/def_force.txtar diff --git a/cmd/cue/cmd/testdata/script/def_inline.txt b/cmd/cue/cmd/testdata/script/def_inline.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/def_inline.txt rename to cmd/cue/cmd/testdata/script/def_inline.txtar diff --git a/cmd/cue/cmd/testdata/script/def_jsonschema.txt b/cmd/cue/cmd/testdata/script/def_jsonschema.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/def_jsonschema.txt rename to cmd/cue/cmd/testdata/script/def_jsonschema.txtar diff --git a/cmd/cue/cmd/testdata/script/def_openapi.txt b/cmd/cue/cmd/testdata/script/def_openapi.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/def_openapi.txt rename to cmd/cue/cmd/testdata/script/def_openapi.txtar diff --git a/cmd/cue/cmd/testdata/script/def_proto.txt b/cmd/cue/cmd/testdata/script/def_proto.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/def_proto.txt rename to cmd/cue/cmd/testdata/script/def_proto.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_concrete.txt b/cmd/cue/cmd/testdata/script/eval_concrete.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_concrete.txt rename to cmd/cue/cmd/testdata/script/eval_concrete.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_context.txt b/cmd/cue/cmd/testdata/script/eval_context.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_context.txt rename to cmd/cue/cmd/testdata/script/eval_context.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_datapkg.txt b/cmd/cue/cmd/testdata/script/eval_datapkg.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_datapkg.txt rename to cmd/cue/cmd/testdata/script/eval_datapkg.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_e.txt b/cmd/cue/cmd/testdata/script/eval_e.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_e.txt rename to cmd/cue/cmd/testdata/script/eval_e.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_e_hidden.txt b/cmd/cue/cmd/testdata/script/eval_e_hidden.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_e_hidden.txt rename to cmd/cue/cmd/testdata/script/eval_e_hidden.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_errs.txt b/cmd/cue/cmd/testdata/script/eval_errs.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_errs.txt rename to cmd/cue/cmd/testdata/script/eval_errs.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_expr.txt b/cmd/cue/cmd/testdata/script/eval_expr.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_expr.txt rename to cmd/cue/cmd/testdata/script/eval_expr.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_flags.txt b/cmd/cue/cmd/testdata/script/eval_flags.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_flags.txt rename to cmd/cue/cmd/testdata/script/eval_flags.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_force.txt b/cmd/cue/cmd/testdata/script/eval_force.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_force.txt rename to cmd/cue/cmd/testdata/script/eval_force.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_hidden.txt b/cmd/cue/cmd/testdata/script/eval_hidden.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_hidden.txt rename to cmd/cue/cmd/testdata/script/eval_hidden.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_hiddenfail.txt b/cmd/cue/cmd/testdata/script/eval_hiddenfail.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_hiddenfail.txt rename to cmd/cue/cmd/testdata/script/eval_hiddenfail.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_import.txt b/cmd/cue/cmd/testdata/script/eval_import.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_import.txt rename to cmd/cue/cmd/testdata/script/eval_import.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_loaderr.txt b/cmd/cue/cmd/testdata/script/eval_loaderr.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_loaderr.txt rename to cmd/cue/cmd/testdata/script/eval_loaderr.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_mixedfiletypes.txt b/cmd/cue/cmd/testdata/script/eval_mixedfiletypes.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_mixedfiletypes.txt rename to cmd/cue/cmd/testdata/script/eval_mixedfiletypes.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_newline.txt b/cmd/cue/cmd/testdata/script/eval_newline.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_newline.txt rename to cmd/cue/cmd/testdata/script/eval_newline.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_notexistfatal.txt b/cmd/cue/cmd/testdata/script/eval_notexistfatal.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_notexistfatal.txt rename to cmd/cue/cmd/testdata/script/eval_notexistfatal.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_notexistincomplete.txt b/cmd/cue/cmd/testdata/script/eval_notexistincomplete.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_notexistincomplete.txt rename to cmd/cue/cmd/testdata/script/eval_notexistincomplete.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_rec.txt b/cmd/cue/cmd/testdata/script/eval_rec.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_rec.txt rename to cmd/cue/cmd/testdata/script/eval_rec.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_resolve.txt b/cmd/cue/cmd/testdata/script/eval_resolve.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_resolve.txt rename to cmd/cue/cmd/testdata/script/eval_resolve.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_stdin.txt b/cmd/cue/cmd/testdata/script/eval_stdin.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_stdin.txt rename to cmd/cue/cmd/testdata/script/eval_stdin.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_tags.txt b/cmd/cue/cmd/testdata/script/eval_tags.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_tags.txt rename to cmd/cue/cmd/testdata/script/eval_tags.txtar diff --git a/cmd/cue/cmd/testdata/script/eval_tool.txt b/cmd/cue/cmd/testdata/script/eval_tool.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/eval_tool.txt rename to cmd/cue/cmd/testdata/script/eval_tool.txtar diff --git a/cmd/cue/cmd/testdata/script/export.txt b/cmd/cue/cmd/testdata/script/export.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/export.txt rename to cmd/cue/cmd/testdata/script/export.txtar diff --git a/cmd/cue/cmd/testdata/script/export_defaulterr.txt b/cmd/cue/cmd/testdata/script/export_defaulterr.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/export_defaulterr.txt rename to cmd/cue/cmd/testdata/script/export_defaulterr.txtar diff --git a/cmd/cue/cmd/testdata/script/export_err.txt b/cmd/cue/cmd/testdata/script/export_err.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/export_err.txt rename to cmd/cue/cmd/testdata/script/export_err.txtar diff --git a/cmd/cue/cmd/testdata/script/export_expr.txt b/cmd/cue/cmd/testdata/script/export_expr.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/export_expr.txt rename to cmd/cue/cmd/testdata/script/export_expr.txtar diff --git a/cmd/cue/cmd/testdata/script/export_force.txt b/cmd/cue/cmd/testdata/script/export_force.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/export_force.txt rename to cmd/cue/cmd/testdata/script/export_force.txtar diff --git a/cmd/cue/cmd/testdata/script/export_incomplete.txt b/cmd/cue/cmd/testdata/script/export_incomplete.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/export_incomplete.txt rename to cmd/cue/cmd/testdata/script/export_incomplete.txtar diff --git a/cmd/cue/cmd/testdata/script/export_list.txt b/cmd/cue/cmd/testdata/script/export_list.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/export_list.txt rename to cmd/cue/cmd/testdata/script/export_list.txtar diff --git a/cmd/cue/cmd/testdata/script/export_select.txt b/cmd/cue/cmd/testdata/script/export_select.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/export_select.txt rename to cmd/cue/cmd/testdata/script/export_select.txtar diff --git a/cmd/cue/cmd/testdata/script/export_yaml.txt b/cmd/cue/cmd/testdata/script/export_yaml.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/export_yaml.txt rename to cmd/cue/cmd/testdata/script/export_yaml.txtar diff --git a/cmd/cue/cmd/testdata/script/file_forms.txt b/cmd/cue/cmd/testdata/script/file_forms.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/file_forms.txt rename to cmd/cue/cmd/testdata/script/file_forms.txtar diff --git a/cmd/cue/cmd/testdata/script/fix.txt b/cmd/cue/cmd/testdata/script/fix.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/fix.txt rename to cmd/cue/cmd/testdata/script/fix.txtar diff --git a/cmd/cue/cmd/testdata/script/fix_files.txt b/cmd/cue/cmd/testdata/script/fix_files.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/fix_files.txt rename to cmd/cue/cmd/testdata/script/fix_files.txtar diff --git a/cmd/cue/cmd/testdata/script/fix_pkg.txt b/cmd/cue/cmd/testdata/script/fix_pkg.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/fix_pkg.txt rename to cmd/cue/cmd/testdata/script/fix_pkg.txtar diff --git a/cmd/cue/cmd/testdata/script/fmt.txt b/cmd/cue/cmd/testdata/script/fmt.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/fmt.txt rename to cmd/cue/cmd/testdata/script/fmt.txtar diff --git a/cmd/cue/cmd/testdata/script/fmt_err.txt b/cmd/cue/cmd/testdata/script/fmt_err.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/fmt_err.txt rename to cmd/cue/cmd/testdata/script/fmt_err.txtar diff --git a/cmd/cue/cmd/testdata/script/fmt_issue1553.txt b/cmd/cue/cmd/testdata/script/fmt_issue1553.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/fmt_issue1553.txt rename to cmd/cue/cmd/testdata/script/fmt_issue1553.txtar diff --git a/cmd/cue/cmd/testdata/script/fmt_multi.txt b/cmd/cue/cmd/testdata/script/fmt_multi.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/fmt_multi.txt rename to cmd/cue/cmd/testdata/script/fmt_multi.txtar diff --git a/cmd/cue/cmd/testdata/script/fmt_stdin.txt b/cmd/cue/cmd/testdata/script/fmt_stdin.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/fmt_stdin.txt rename to cmd/cue/cmd/testdata/script/fmt_stdin.txtar diff --git a/cmd/cue/cmd/testdata/script/get_go_anon.txt b/cmd/cue/cmd/testdata/script/get_go_anon.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/get_go_anon.txt rename to cmd/cue/cmd/testdata/script/get_go_anon.txtar diff --git a/cmd/cue/cmd/testdata/script/get_go_bad_embed.txt b/cmd/cue/cmd/testdata/script/get_go_bad_embed.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/get_go_bad_embed.txt rename to cmd/cue/cmd/testdata/script/get_go_bad_embed.txtar diff --git a/cmd/cue/cmd/testdata/script/get_go_local.txt b/cmd/cue/cmd/testdata/script/get_go_local.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/get_go_local.txt rename to cmd/cue/cmd/testdata/script/get_go_local.txtar diff --git a/cmd/cue/cmd/testdata/script/get_go_non_local.txt b/cmd/cue/cmd/testdata/script/get_go_non_local.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/get_go_non_local.txt rename to cmd/cue/cmd/testdata/script/get_go_non_local.txtar diff --git a/cmd/cue/cmd/testdata/script/get_go_type_errors.txt b/cmd/cue/cmd/testdata/script/get_go_type_errors.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/get_go_type_errors.txt rename to cmd/cue/cmd/testdata/script/get_go_type_errors.txtar diff --git a/cmd/cue/cmd/testdata/script/get_go_types.txt b/cmd/cue/cmd/testdata/script/get_go_types.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/get_go_types.txt rename to cmd/cue/cmd/testdata/script/get_go_types.txtar diff --git a/cmd/cue/cmd/testdata/script/get_go_unresolvable_package.txt b/cmd/cue/cmd/testdata/script/get_go_unresolvable_package.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/get_go_unresolvable_package.txt rename to cmd/cue/cmd/testdata/script/get_go_unresolvable_package.txtar diff --git a/cmd/cue/cmd/testdata/script/go_cmd.txt b/cmd/cue/cmd/testdata/script/go_cmd.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/go_cmd.txt rename to cmd/cue/cmd/testdata/script/go_cmd.txtar diff --git a/cmd/cue/cmd/testdata/script/goproxytest.txt b/cmd/cue/cmd/testdata/script/goproxytest.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/goproxytest.txt rename to cmd/cue/cmd/testdata/script/goproxytest.txtar diff --git a/cmd/cue/cmd/testdata/script/help.txt b/cmd/cue/cmd/testdata/script/help.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/help.txt rename to cmd/cue/cmd/testdata/script/help.txtar diff --git a/cmd/cue/cmd/testdata/script/help_cmd.txt b/cmd/cue/cmd/testdata/script/help_cmd.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/help_cmd.txt rename to cmd/cue/cmd/testdata/script/help_cmd.txtar diff --git a/cmd/cue/cmd/testdata/script/help_cmd_flags.txt b/cmd/cue/cmd/testdata/script/help_cmd_flags.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/help_cmd_flags.txt rename to cmd/cue/cmd/testdata/script/help_cmd_flags.txtar diff --git a/cmd/cue/cmd/testdata/script/help_doc.txt b/cmd/cue/cmd/testdata/script/help_doc.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/help_doc.txt rename to cmd/cue/cmd/testdata/script/help_doc.txtar diff --git a/cmd/cue/cmd/testdata/script/help_hello.txt b/cmd/cue/cmd/testdata/script/help_hello.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/help_hello.txt rename to cmd/cue/cmd/testdata/script/help_hello.txtar diff --git a/cmd/cue/cmd/testdata/script/hidden.txt b/cmd/cue/cmd/testdata/script/hidden.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/hidden.txt rename to cmd/cue/cmd/testdata/script/hidden.txtar diff --git a/cmd/cue/cmd/testdata/script/import_auto.txt b/cmd/cue/cmd/testdata/script/import_auto.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/import_auto.txt rename to cmd/cue/cmd/testdata/script/import_auto.txtar diff --git a/cmd/cue/cmd/testdata/script/import_binary.txt b/cmd/cue/cmd/testdata/script/import_binary.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/import_binary.txt rename to cmd/cue/cmd/testdata/script/import_binary.txtar diff --git a/cmd/cue/cmd/testdata/script/import_context.txt b/cmd/cue/cmd/testdata/script/import_context.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/import_context.txt rename to cmd/cue/cmd/testdata/script/import_context.txtar diff --git a/cmd/cue/cmd/testdata/script/import_dir.txt b/cmd/cue/cmd/testdata/script/import_dir.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/import_dir.txt rename to cmd/cue/cmd/testdata/script/import_dir.txtar diff --git a/cmd/cue/cmd/testdata/script/import_files.txt b/cmd/cue/cmd/testdata/script/import_files.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/import_files.txt rename to cmd/cue/cmd/testdata/script/import_files.txtar diff --git a/cmd/cue/cmd/testdata/script/import_hoiststr.txt b/cmd/cue/cmd/testdata/script/import_hoiststr.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/import_hoiststr.txt rename to cmd/cue/cmd/testdata/script/import_hoiststr.txtar diff --git a/cmd/cue/cmd/testdata/script/import_list.txt b/cmd/cue/cmd/testdata/script/import_list.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/import_list.txt rename to cmd/cue/cmd/testdata/script/import_list.txtar diff --git a/cmd/cue/cmd/testdata/script/import_match.txt b/cmd/cue/cmd/testdata/script/import_match.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/import_match.txt rename to cmd/cue/cmd/testdata/script/import_match.txtar diff --git a/cmd/cue/cmd/testdata/script/import_merge.txt b/cmd/cue/cmd/testdata/script/import_merge.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/import_merge.txt rename to cmd/cue/cmd/testdata/script/import_merge.txtar diff --git a/cmd/cue/cmd/testdata/script/import_path.txt b/cmd/cue/cmd/testdata/script/import_path.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/import_path.txt rename to cmd/cue/cmd/testdata/script/import_path.txtar diff --git a/cmd/cue/cmd/testdata/script/import_proto.txt b/cmd/cue/cmd/testdata/script/import_proto.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/import_proto.txt rename to cmd/cue/cmd/testdata/script/import_proto.txtar diff --git a/cmd/cue/cmd/testdata/script/import_proto2.txt b/cmd/cue/cmd/testdata/script/import_proto2.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/import_proto2.txt rename to cmd/cue/cmd/testdata/script/import_proto2.txtar diff --git a/cmd/cue/cmd/testdata/script/inject.txt b/cmd/cue/cmd/testdata/script/inject.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/inject.txt rename to cmd/cue/cmd/testdata/script/inject.txtar diff --git a/cmd/cue/cmd/testdata/script/injecterr.txt b/cmd/cue/cmd/testdata/script/injecterr.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/injecterr.txt rename to cmd/cue/cmd/testdata/script/injecterr.txtar diff --git a/cmd/cue/cmd/testdata/script/install.txt b/cmd/cue/cmd/testdata/script/install.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/install.txt rename to cmd/cue/cmd/testdata/script/install.txtar diff --git a/cmd/cue/cmd/testdata/script/install_contributing.txt b/cmd/cue/cmd/testdata/script/install_contributing.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/install_contributing.txt rename to cmd/cue/cmd/testdata/script/install_contributing.txtar diff --git a/cmd/cue/cmd/testdata/script/issue116.txt b/cmd/cue/cmd/testdata/script/issue116.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue116.txt rename to cmd/cue/cmd/testdata/script/issue116.txtar diff --git a/cmd/cue/cmd/testdata/script/issue1270.txt b/cmd/cue/cmd/testdata/script/issue1270.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue1270.txt rename to cmd/cue/cmd/testdata/script/issue1270.txtar diff --git a/cmd/cue/cmd/testdata/script/issue174.txt b/cmd/cue/cmd/testdata/script/issue174.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue174.txt rename to cmd/cue/cmd/testdata/script/issue174.txtar diff --git a/cmd/cue/cmd/testdata/script/issue217.txt b/cmd/cue/cmd/testdata/script/issue217.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue217.txt rename to cmd/cue/cmd/testdata/script/issue217.txtar diff --git a/cmd/cue/cmd/testdata/script/issue236.txt b/cmd/cue/cmd/testdata/script/issue236.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue236.txt rename to cmd/cue/cmd/testdata/script/issue236.txtar diff --git a/cmd/cue/cmd/testdata/script/issue269.txt b/cmd/cue/cmd/testdata/script/issue269.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue269.txt rename to cmd/cue/cmd/testdata/script/issue269.txtar diff --git a/cmd/cue/cmd/testdata/script/issue289.txt b/cmd/cue/cmd/testdata/script/issue289.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue289.txt rename to cmd/cue/cmd/testdata/script/issue289.txtar diff --git a/cmd/cue/cmd/testdata/script/issue302.txt b/cmd/cue/cmd/testdata/script/issue302.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue302.txt rename to cmd/cue/cmd/testdata/script/issue302.txtar diff --git a/cmd/cue/cmd/testdata/script/issue303.txt b/cmd/cue/cmd/testdata/script/issue303.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue303.txt rename to cmd/cue/cmd/testdata/script/issue303.txtar diff --git a/cmd/cue/cmd/testdata/script/issue304.txt b/cmd/cue/cmd/testdata/script/issue304.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue304.txt rename to cmd/cue/cmd/testdata/script/issue304.txtar diff --git a/cmd/cue/cmd/testdata/script/issue312.txt b/cmd/cue/cmd/testdata/script/issue312.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue312.txt rename to cmd/cue/cmd/testdata/script/issue312.txtar diff --git a/cmd/cue/cmd/testdata/script/issue315.txt b/cmd/cue/cmd/testdata/script/issue315.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue315.txt rename to cmd/cue/cmd/testdata/script/issue315.txtar diff --git a/cmd/cue/cmd/testdata/script/issue322.txt b/cmd/cue/cmd/testdata/script/issue322.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue322.txt rename to cmd/cue/cmd/testdata/script/issue322.txtar diff --git a/cmd/cue/cmd/testdata/script/issue324.txt b/cmd/cue/cmd/testdata/script/issue324.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue324.txt rename to cmd/cue/cmd/testdata/script/issue324.txtar diff --git a/cmd/cue/cmd/testdata/script/issue398.txt b/cmd/cue/cmd/testdata/script/issue398.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue398.txt rename to cmd/cue/cmd/testdata/script/issue398.txtar diff --git a/cmd/cue/cmd/testdata/script/issue425.txt b/cmd/cue/cmd/testdata/script/issue425.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue425.txt rename to cmd/cue/cmd/testdata/script/issue425.txtar diff --git a/cmd/cue/cmd/testdata/script/issue461.txt b/cmd/cue/cmd/testdata/script/issue461.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue461.txt rename to cmd/cue/cmd/testdata/script/issue461.txtar diff --git a/cmd/cue/cmd/testdata/script/issue473.txt b/cmd/cue/cmd/testdata/script/issue473.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue473.txt rename to cmd/cue/cmd/testdata/script/issue473.txtar diff --git a/cmd/cue/cmd/testdata/script/issue476.txt b/cmd/cue/cmd/testdata/script/issue476.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue476.txt rename to cmd/cue/cmd/testdata/script/issue476.txtar diff --git a/cmd/cue/cmd/testdata/script/issue477.txt b/cmd/cue/cmd/testdata/script/issue477.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue477.txt rename to cmd/cue/cmd/testdata/script/issue477.txtar diff --git a/cmd/cue/cmd/testdata/script/issue512.txt b/cmd/cue/cmd/testdata/script/issue512.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue512.txt rename to cmd/cue/cmd/testdata/script/issue512.txtar diff --git a/cmd/cue/cmd/testdata/script/issue520.txt b/cmd/cue/cmd/testdata/script/issue520.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue520.txt rename to cmd/cue/cmd/testdata/script/issue520.txtar diff --git a/cmd/cue/cmd/testdata/script/issue525.txt b/cmd/cue/cmd/testdata/script/issue525.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue525.txt rename to cmd/cue/cmd/testdata/script/issue525.txtar diff --git a/cmd/cue/cmd/testdata/script/issue526.txt b/cmd/cue/cmd/testdata/script/issue526.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue526.txt rename to cmd/cue/cmd/testdata/script/issue526.txtar diff --git a/cmd/cue/cmd/testdata/script/issue749.txt b/cmd/cue/cmd/testdata/script/issue749.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue749.txt rename to cmd/cue/cmd/testdata/script/issue749.txtar diff --git a/cmd/cue/cmd/testdata/script/issue986.txt b/cmd/cue/cmd/testdata/script/issue986.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/issue986.txt rename to cmd/cue/cmd/testdata/script/issue986.txtar diff --git a/cmd/cue/cmd/testdata/script/load_pkg.txt b/cmd/cue/cmd/testdata/script/load_pkg.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/load_pkg.txt rename to cmd/cue/cmd/testdata/script/load_pkg.txtar diff --git a/cmd/cue/cmd/testdata/script/merge_interaction.txt b/cmd/cue/cmd/testdata/script/merge_interaction.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/merge_interaction.txt rename to cmd/cue/cmd/testdata/script/merge_interaction.txtar diff --git a/cmd/cue/cmd/testdata/script/no_read_stdin.txt b/cmd/cue/cmd/testdata/script/no_read_stdin.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/no_read_stdin.txt rename to cmd/cue/cmd/testdata/script/no_read_stdin.txtar diff --git a/cmd/cue/cmd/testdata/script/toolonly.txt b/cmd/cue/cmd/testdata/script/toolonly.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/toolonly.txt rename to cmd/cue/cmd/testdata/script/toolonly.txtar diff --git a/cmd/cue/cmd/testdata/script/trim.txt b/cmd/cue/cmd/testdata/script/trim.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/trim.txt rename to cmd/cue/cmd/testdata/script/trim.txtar diff --git a/cmd/cue/cmd/testdata/script/trim_force.txt b/cmd/cue/cmd/testdata/script/trim_force.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/trim_force.txt rename to cmd/cue/cmd/testdata/script/trim_force.txtar diff --git a/cmd/cue/cmd/testdata/script/version.txt b/cmd/cue/cmd/testdata/script/version.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/version.txt rename to cmd/cue/cmd/testdata/script/version.txtar diff --git a/cmd/cue/cmd/testdata/script/vet.txt b/cmd/cue/cmd/testdata/script/vet.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/vet.txt rename to cmd/cue/cmd/testdata/script/vet.txtar diff --git a/cmd/cue/cmd/testdata/script/vet_altdata.txt b/cmd/cue/cmd/testdata/script/vet_altdata.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/vet_altdata.txt rename to cmd/cue/cmd/testdata/script/vet_altdata.txtar diff --git a/cmd/cue/cmd/testdata/script/vet_concrete.txt b/cmd/cue/cmd/testdata/script/vet_concrete.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/vet_concrete.txt rename to cmd/cue/cmd/testdata/script/vet_concrete.txtar diff --git a/cmd/cue/cmd/testdata/script/vet_data.txt b/cmd/cue/cmd/testdata/script/vet_data.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/vet_data.txt rename to cmd/cue/cmd/testdata/script/vet_data.txtar diff --git a/cmd/cue/cmd/testdata/script/vet_disjunction.txt b/cmd/cue/cmd/testdata/script/vet_disjunction.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/vet_disjunction.txt rename to cmd/cue/cmd/testdata/script/vet_disjunction.txtar diff --git a/cmd/cue/cmd/testdata/script/vet_embed.txt b/cmd/cue/cmd/testdata/script/vet_embed.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/vet_embed.txt rename to cmd/cue/cmd/testdata/script/vet_embed.txtar diff --git a/cmd/cue/cmd/testdata/script/vet_expr.txt b/cmd/cue/cmd/testdata/script/vet_expr.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/vet_expr.txt rename to cmd/cue/cmd/testdata/script/vet_expr.txtar diff --git a/cmd/cue/cmd/testdata/script/vet_file.txt b/cmd/cue/cmd/testdata/script/vet_file.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/vet_file.txt rename to cmd/cue/cmd/testdata/script/vet_file.txtar diff --git a/cmd/cue/cmd/testdata/script/vet_opt.txt b/cmd/cue/cmd/testdata/script/vet_opt.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/vet_opt.txt rename to cmd/cue/cmd/testdata/script/vet_opt.txtar diff --git a/cmd/cue/cmd/testdata/script/vet_path.txt b/cmd/cue/cmd/testdata/script/vet_path.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/vet_path.txt rename to cmd/cue/cmd/testdata/script/vet_path.txtar diff --git a/cmd/cue/cmd/testdata/script/vet_yaml.txt b/cmd/cue/cmd/testdata/script/vet_yaml.txtar similarity index 100% rename from cmd/cue/cmd/testdata/script/vet_yaml.txt rename to cmd/cue/cmd/testdata/script/vet_yaml.txtar diff --git a/doc/contribute.md b/doc/contribute.md index f9dae4a9d10..5064f7acdcb 100644 --- a/doc/contribute.md +++ b/doc/contribute.md @@ -385,7 +385,7 @@ Changes to CUE must be reviewed before they are accepted, no matter who makes the change. A custom `git` command called `git-codereview` simplifies sending changes to Gerrit. - + Install the `git-codereview` command by running, diff --git a/doc/install.md b/doc/install.md index 04f9a2ecab4..dcf10aa349a 100644 --- a/doc/install.md +++ b/doc/install.md @@ -10,7 +10,7 @@ Go 1.17 or higher (see below) ### Installing CUE - + To download and install the `cue` command line tool run diff --git a/doc/tutorial/basics/0_intro/10_json.txt b/doc/tutorial/basics/0_intro/10_json.txtarar similarity index 100% rename from doc/tutorial/basics/0_intro/10_json.txt rename to doc/tutorial/basics/0_intro/10_json.txtarar diff --git a/doc/tutorial/basics/0_intro/20_cue.txt b/doc/tutorial/basics/0_intro/20_cue.txtar similarity index 100% rename from doc/tutorial/basics/0_intro/20_cue.txt rename to doc/tutorial/basics/0_intro/20_cue.txtar diff --git a/doc/tutorial/basics/0_intro/30_duplicates.txt b/doc/tutorial/basics/0_intro/30_duplicates.txtar similarity index 100% rename from doc/tutorial/basics/0_intro/30_duplicates.txt rename to doc/tutorial/basics/0_intro/30_duplicates.txtar diff --git a/doc/tutorial/basics/0_intro/40_constraints.txt b/doc/tutorial/basics/0_intro/40_constraints.txtar similarity index 100% rename from doc/tutorial/basics/0_intro/40_constraints.txt rename to doc/tutorial/basics/0_intro/40_constraints.txtar diff --git a/doc/tutorial/basics/0_intro/43_schema.txt b/doc/tutorial/basics/0_intro/43_schema.txtar similarity index 100% rename from doc/tutorial/basics/0_intro/43_schema.txt rename to doc/tutorial/basics/0_intro/43_schema.txtar diff --git a/doc/tutorial/basics/0_intro/47_validation.txt b/doc/tutorial/basics/0_intro/47_validation.txtar similarity index 100% rename from doc/tutorial/basics/0_intro/47_validation.txt rename to doc/tutorial/basics/0_intro/47_validation.txtar diff --git a/doc/tutorial/basics/0_intro/50_order.txt b/doc/tutorial/basics/0_intro/50_order.txtar similarity index 100% rename from doc/tutorial/basics/0_intro/50_order.txt rename to doc/tutorial/basics/0_intro/50_order.txtar diff --git a/doc/tutorial/basics/0_intro/55_fold.txt b/doc/tutorial/basics/0_intro/55_fold.txtar similarity index 100% rename from doc/tutorial/basics/0_intro/55_fold.txt rename to doc/tutorial/basics/0_intro/55_fold.txtar diff --git a/doc/tutorial/basics/0_intro/80_boilerplate.txt b/doc/tutorial/basics/0_intro/80_boilerplate.txtar similarity index 100% rename from doc/tutorial/basics/0_intro/80_boilerplate.txt rename to doc/tutorial/basics/0_intro/80_boilerplate.txtar diff --git a/doc/tutorial/basics/2_types/05_types.txt b/doc/tutorial/basics/2_types/05_types.txtar similarity index 100% rename from doc/tutorial/basics/2_types/05_types.txt rename to doc/tutorial/basics/2_types/05_types.txtar diff --git a/doc/tutorial/basics/2_types/20_bottom.txt b/doc/tutorial/basics/2_types/20_bottom.txtar similarity index 100% rename from doc/tutorial/basics/2_types/20_bottom.txt rename to doc/tutorial/basics/2_types/20_bottom.txtar diff --git a/doc/tutorial/basics/2_types/30_numbers.txt b/doc/tutorial/basics/2_types/30_numbers.txtar similarity index 100% rename from doc/tutorial/basics/2_types/30_numbers.txt rename to doc/tutorial/basics/2_types/30_numbers.txtar diff --git a/doc/tutorial/basics/2_types/40_stringlit.txt b/doc/tutorial/basics/2_types/40_stringlit.txtar similarity index 100% rename from doc/tutorial/basics/2_types/40_stringlit.txt rename to doc/tutorial/basics/2_types/40_stringlit.txtar diff --git a/doc/tutorial/basics/2_types/45_stringraw.txt b/doc/tutorial/basics/2_types/45_stringraw.txtar similarity index 100% rename from doc/tutorial/basics/2_types/45_stringraw.txt rename to doc/tutorial/basics/2_types/45_stringraw.txtar diff --git a/doc/tutorial/basics/2_types/48_bytes.txt b/doc/tutorial/basics/2_types/48_bytes.txtar similarity index 100% rename from doc/tutorial/basics/2_types/48_bytes.txt rename to doc/tutorial/basics/2_types/48_bytes.txtar diff --git a/doc/tutorial/basics/2_types/50_closed.txt b/doc/tutorial/basics/2_types/50_closed.txtar similarity index 100% rename from doc/tutorial/basics/2_types/50_closed.txt rename to doc/tutorial/basics/2_types/50_closed.txtar diff --git a/doc/tutorial/basics/2_types/55_defs.txt b/doc/tutorial/basics/2_types/55_defs.txtar similarity index 100% rename from doc/tutorial/basics/2_types/55_defs.txt rename to doc/tutorial/basics/2_types/55_defs.txtar diff --git a/doc/tutorial/basics/2_types/56_optional.txt b/doc/tutorial/basics/2_types/56_optional.txtar similarity index 100% rename from doc/tutorial/basics/2_types/56_optional.txt rename to doc/tutorial/basics/2_types/56_optional.txtar diff --git a/doc/tutorial/basics/2_types/60_disjunctions.txt b/doc/tutorial/basics/2_types/60_disjunctions.txtar similarity index 100% rename from doc/tutorial/basics/2_types/60_disjunctions.txt rename to doc/tutorial/basics/2_types/60_disjunctions.txtar diff --git a/doc/tutorial/basics/2_types/65_defaults.txt b/doc/tutorial/basics/2_types/65_defaults.txtar similarity index 100% rename from doc/tutorial/basics/2_types/65_defaults.txt rename to doc/tutorial/basics/2_types/65_defaults.txtar diff --git a/doc/tutorial/basics/2_types/65_sumstruct.txt b/doc/tutorial/basics/2_types/65_sumstruct.txtar similarity index 100% rename from doc/tutorial/basics/2_types/65_sumstruct.txt rename to doc/tutorial/basics/2_types/65_sumstruct.txtar diff --git a/doc/tutorial/basics/2_types/70_bounds.txt b/doc/tutorial/basics/2_types/70_bounds.txtar similarity index 100% rename from doc/tutorial/basics/2_types/70_bounds.txt rename to doc/tutorial/basics/2_types/70_bounds.txtar diff --git a/doc/tutorial/basics/2_types/75_bounddef.txt b/doc/tutorial/basics/2_types/75_bounddef.txtar similarity index 100% rename from doc/tutorial/basics/2_types/75_bounddef.txt rename to doc/tutorial/basics/2_types/75_bounddef.txtar diff --git a/doc/tutorial/basics/2_types/80_lists.txt b/doc/tutorial/basics/2_types/80_lists.txtar similarity index 100% rename from doc/tutorial/basics/2_types/80_lists.txt rename to doc/tutorial/basics/2_types/80_lists.txtar diff --git a/doc/tutorial/basics/2_types/90_templates.txt b/doc/tutorial/basics/2_types/90_templates.txtar similarity index 100% rename from doc/tutorial/basics/2_types/90_templates.txt rename to doc/tutorial/basics/2_types/90_templates.txtar diff --git a/doc/tutorial/basics/4_references/10_scopes.txt b/doc/tutorial/basics/4_references/10_scopes.txtar similarity index 100% rename from doc/tutorial/basics/4_references/10_scopes.txt rename to doc/tutorial/basics/4_references/10_scopes.txtar diff --git a/doc/tutorial/basics/4_references/20_selectors.txt b/doc/tutorial/basics/4_references/20_selectors.txtar similarity index 100% rename from doc/tutorial/basics/4_references/20_selectors.txt rename to doc/tutorial/basics/4_references/20_selectors.txtar diff --git a/doc/tutorial/basics/4_references/30_aliases.txt b/doc/tutorial/basics/4_references/30_aliases.txtar similarity index 100% rename from doc/tutorial/basics/4_references/30_aliases.txt rename to doc/tutorial/basics/4_references/30_aliases.txtar diff --git a/doc/tutorial/basics/4_references/50_emit.txt b/doc/tutorial/basics/4_references/50_emit.txtar similarity index 100% rename from doc/tutorial/basics/4_references/50_emit.txt rename to doc/tutorial/basics/4_references/50_emit.txtar diff --git a/doc/tutorial/basics/4_references/80_cycle.txt b/doc/tutorial/basics/4_references/80_cycle.txtar similarity index 100% rename from doc/tutorial/basics/4_references/80_cycle.txt rename to doc/tutorial/basics/4_references/80_cycle.txtar diff --git a/doc/tutorial/basics/4_references/85_cycleref.txt b/doc/tutorial/basics/4_references/85_cycleref.txtar similarity index 100% rename from doc/tutorial/basics/4_references/85_cycleref.txt rename to doc/tutorial/basics/4_references/85_cycleref.txtar diff --git a/doc/tutorial/basics/4_references/99_hidden.txt b/doc/tutorial/basics/4_references/99_hidden.txtar similarity index 100% rename from doc/tutorial/basics/4_references/99_hidden.txt rename to doc/tutorial/basics/4_references/99_hidden.txtar diff --git a/doc/tutorial/basics/6_expressions/10_operators.txt b/doc/tutorial/basics/6_expressions/10_operators.txtar similarity index 100% rename from doc/tutorial/basics/6_expressions/10_operators.txt rename to doc/tutorial/basics/6_expressions/10_operators.txtar diff --git a/doc/tutorial/basics/6_expressions/20_interpolation.txt b/doc/tutorial/basics/6_expressions/20_interpolation.txtar similarity index 100% rename from doc/tutorial/basics/6_expressions/20_interpolation.txt rename to doc/tutorial/basics/6_expressions/20_interpolation.txtar diff --git a/doc/tutorial/basics/6_expressions/25_interpolfield.txt b/doc/tutorial/basics/6_expressions/25_interpolfield.txtar similarity index 100% rename from doc/tutorial/basics/6_expressions/25_interpolfield.txt rename to doc/tutorial/basics/6_expressions/25_interpolfield.txtar diff --git a/doc/tutorial/basics/6_expressions/40_listcomp.txt b/doc/tutorial/basics/6_expressions/40_listcomp.txtar similarity index 100% rename from doc/tutorial/basics/6_expressions/40_listcomp.txt rename to doc/tutorial/basics/6_expressions/40_listcomp.txtar diff --git a/doc/tutorial/basics/6_expressions/50_fieldcomp.txt b/doc/tutorial/basics/6_expressions/50_fieldcomp.txtar similarity index 100% rename from doc/tutorial/basics/6_expressions/50_fieldcomp.txt rename to doc/tutorial/basics/6_expressions/50_fieldcomp.txtar diff --git a/doc/tutorial/basics/6_expressions/55_conditional.txt b/doc/tutorial/basics/6_expressions/55_conditional.txtar similarity index 100% rename from doc/tutorial/basics/6_expressions/55_conditional.txt rename to doc/tutorial/basics/6_expressions/55_conditional.txtar diff --git a/doc/tutorial/basics/6_expressions/70_regexp.txt b/doc/tutorial/basics/6_expressions/70_regexp.txtar similarity index 100% rename from doc/tutorial/basics/6_expressions/70_regexp.txt rename to doc/tutorial/basics/6_expressions/70_regexp.txtar diff --git a/doc/tutorial/basics/6_expressions/80_coalesce.txt b/doc/tutorial/basics/6_expressions/80_coalesce.txtar similarity index 100% rename from doc/tutorial/basics/6_expressions/80_coalesce.txt rename to doc/tutorial/basics/6_expressions/80_coalesce.txtar diff --git a/doc/tutorial/basics/8_packages/10_packages.txt b/doc/tutorial/basics/8_packages/10_packages.txtar similarity index 100% rename from doc/tutorial/basics/8_packages/10_packages.txt rename to doc/tutorial/basics/8_packages/10_packages.txtar diff --git a/doc/tutorial/basics/8_packages/30_imports.txt b/doc/tutorial/basics/8_packages/30_imports.txtar similarity index 100% rename from doc/tutorial/basics/8_packages/30_imports.txt rename to doc/tutorial/basics/8_packages/30_imports.txtar diff --git a/doc/tutorial/basics/script_test.go b/doc/tutorial/basics/script_test.go index 01206a006cd..36c20887a57 100644 --- a/doc/tutorial/basics/script_test.go +++ b/doc/tutorial/basics/script_test.go @@ -23,7 +23,7 @@ func TestLatest(t *testing.T) { if err != nil { return err } - if !strings.HasSuffix(fullpath, ".txt") { + if !strings.HasSuffix(fullpath, ".txtar") { return nil } diff --git a/go.mod b/go.mod index 50ed76f94e2..2b5023e3e67 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/kylelemons/godebug v1.1.0 github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b - github.com/rogpeppe/go-internal v1.8.1 + github.com/rogpeppe/go-internal v1.9.0 github.com/spf13/cobra v1.4.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.2.2 @@ -34,5 +34,5 @@ require ( github.com/pkg/errors v0.8.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect - gopkg.in/errgo.v2 v2.1.0 // indirect + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect ) diff --git a/go.sum b/go.sum index fef3e49cfd2..f123b013f62 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b h1:zd/2RNzIRkoGGMjE+YIsZ85CnDIz672JK2F3Zl4vux4= github.com/protocolbuffers/txtpbfmt v0.0.0-20220428173112-74888fd59c2b/go.mod h1:KjY0wibdYKc4DYkerHSbguaf3JeIPGhNJBp2BNiFH78= -github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= -github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= @@ -80,8 +80,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=