all: use txtar filename extensions consistently

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í <[email protected]> Change-Id: I2fc1a108af6cd4544a00d0ffc3f334b5bbd6c720 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/542611 Reviewed-by: Roger Peppe <[email protected]> Unity-Result: CUEcueckoo <[email protected]> TryBot-Result: CUEcueckoo <[email protected]>
cue-lang · Aug 23, 2022 · c1689bb · c1689bb
1 parent 0460b47
commit c1689bb
Show file tree

Hide file tree

Showing 203 changed files with 10 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -106,7 +106,7 @@ brew install cue-lang/tap/cue
 
 #### Install from Source
 
-<!-- Keep the following in sync with cmd/cue/cmd/testdata/script/install*.txt -->
+<!-- Keep the following in sync with cmd/cue/cmd/testdata/script/install*.txtar -->
 
 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
@@ -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/...data/mod/externalmod.test_blah_v1.0.0.txt → ...ta/mod/externalmod.test_blah_v1.0.0.txtar b/...data/mod/externalmod.test_blah_v1.0.0.txt → ...ta/mod/externalmod.test_blah_v1.0.0.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_after.txt → cmd/cue/cmd/testdata/script/cmd_after.txtar b/cmd/cue/cmd/testdata/script/cmd_after.txt → cmd/cue/cmd/testdata/script/cmd_after.txtar
diff --git a/...ue/cmd/testdata/script/cmd_baddisplay.txt → .../cmd/testdata/script/cmd_baddisplay.txtar b/...ue/cmd/testdata/script/cmd_baddisplay.txt → .../cmd/testdata/script/cmd_baddisplay.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_closed.txt → cmd/cue/cmd/testdata/script/cmd_closed.txtar b/cmd/cue/cmd/testdata/script/cmd_closed.txt → cmd/cue/cmd/testdata/script/cmd_closed.txtar
diff --git a/...ue/cmd/testdata/script/cmd_concurrent.txt → .../cmd/testdata/script/cmd_concurrent.txtar b/...ue/cmd/testdata/script/cmd_concurrent.txt → .../cmd/testdata/script/cmd_concurrent.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_dep.txt → cmd/cue/cmd/testdata/script/cmd_dep.txtar b/cmd/cue/cmd/testdata/script/cmd_dep.txt → cmd/cue/cmd/testdata/script/cmd_dep.txtar
diff --git a/...cue/cmd/testdata/script/cmd_dep_cycle.txt → ...e/cmd/testdata/script/cmd_dep_cycle.txtar b/...cue/cmd/testdata/script/cmd_dep_cycle.txt → ...e/cmd/testdata/script/cmd_dep_cycle.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_deppkg.txt → cmd/cue/cmd/testdata/script/cmd_deppkg.txtar b/cmd/cue/cmd/testdata/script/cmd_deppkg.txt → cmd/cue/cmd/testdata/script/cmd_deppkg.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_dir.txt → cmd/cue/cmd/testdata/script/cmd_dir.txtar b/cmd/cue/cmd/testdata/script/cmd_dir.txt → cmd/cue/cmd/testdata/script/cmd_dir.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_echo.txt → cmd/cue/cmd/testdata/script/cmd_echo.txtar b/cmd/cue/cmd/testdata/script/cmd_echo.txt → cmd/cue/cmd/testdata/script/cmd_echo.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_embed.txt → cmd/cue/cmd/testdata/script/cmd_embed.txtar b/cmd/cue/cmd/testdata/script/cmd_embed.txt → cmd/cue/cmd/testdata/script/cmd_embed.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_env.txt → cmd/cue/cmd/testdata/script/cmd_env.txtar b/cmd/cue/cmd/testdata/script/cmd_env.txt → cmd/cue/cmd/testdata/script/cmd_env.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_err.txt → cmd/cue/cmd/testdata/script/cmd_err.txtar b/cmd/cue/cmd/testdata/script/cmd_err.txt → cmd/cue/cmd/testdata/script/cmd_err.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_errcode.txt → ...cue/cmd/testdata/script/cmd_errcode.txtar b/cmd/cue/cmd/testdata/script/cmd_errcode.txt → ...cue/cmd/testdata/script/cmd_errcode.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_errpos.txt → cmd/cue/cmd/testdata/script/cmd_errpos.txtar b/cmd/cue/cmd/testdata/script/cmd_errpos.txt → cmd/cue/cmd/testdata/script/cmd_errpos.txtar
diff --git a/...cue/cmd/testdata/script/cmd_filetypes.txt → ...e/cmd/testdata/script/cmd_filetypes.txtar b/...cue/cmd/testdata/script/cmd_filetypes.txt → ...e/cmd/testdata/script/cmd_filetypes.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_func.txt → cmd/cue/cmd/testdata/script/cmd_func.txtar b/cmd/cue/cmd/testdata/script/cmd_func.txt → cmd/cue/cmd/testdata/script/cmd_func.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_http.txt → cmd/cue/cmd/testdata/script/cmd_http.txtar b/cmd/cue/cmd/testdata/script/cmd_http.txt → cmd/cue/cmd/testdata/script/cmd_http.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_import.txt → cmd/cue/cmd/testdata/script/cmd_import.txtar b/cmd/cue/cmd/testdata/script/cmd_import.txt → cmd/cue/cmd/testdata/script/cmd_import.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_inferred.txt → ...ue/cmd/testdata/script/cmd_inferred.txtar b/cmd/cue/cmd/testdata/script/cmd_inferred.txt → ...ue/cmd/testdata/script/cmd_inferred.txtar
diff --git a/...cue/cmd/testdata/script/cmd_issue1405.txt → ...e/cmd/testdata/script/cmd_issue1405.txtar b/...cue/cmd/testdata/script/cmd_issue1405.txt → ...e/cmd/testdata/script/cmd_issue1405.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_issue650.txt → ...ue/cmd/testdata/script/cmd_issue650.txtar b/cmd/cue/cmd/testdata/script/cmd_issue650.txt → ...ue/cmd/testdata/script/cmd_issue650.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_jsonpb.txt → cmd/cue/cmd/testdata/script/cmd_jsonpb.txtar b/cmd/cue/cmd/testdata/script/cmd_jsonpb.txt → cmd/cue/cmd/testdata/script/cmd_jsonpb.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_mkdirtmp.txt → ...ue/cmd/testdata/script/cmd_mkdirtmp.txtar b/cmd/cue/cmd/testdata/script/cmd_mkdirtmp.txt → ...ue/cmd/testdata/script/cmd_mkdirtmp.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_notool.txt → cmd/cue/cmd/testdata/script/cmd_notool.txtar b/cmd/cue/cmd/testdata/script/cmd_notool.txt → cmd/cue/cmd/testdata/script/cmd_notool.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_notool2.txt → ...cue/cmd/testdata/script/cmd_notool2.txtar b/cmd/cue/cmd/testdata/script/cmd_notool2.txt → ...cue/cmd/testdata/script/cmd_notool2.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_print.txt → cmd/cue/cmd/testdata/script/cmd_print.txtar b/cmd/cue/cmd/testdata/script/cmd_print.txt → cmd/cue/cmd/testdata/script/cmd_print.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_ref.txt → cmd/cue/cmd/testdata/script/cmd_ref.txtar b/cmd/cue/cmd/testdata/script/cmd_ref.txt → cmd/cue/cmd/testdata/script/cmd_ref.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_run.txt → cmd/cue/cmd/testdata/script/cmd_run.txtar b/cmd/cue/cmd/testdata/script/cmd_run.txt → cmd/cue/cmd/testdata/script/cmd_run.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_run_list.txt → ...ue/cmd/testdata/script/cmd_run_list.txtar b/cmd/cue/cmd/testdata/script/cmd_run_list.txt → ...ue/cmd/testdata/script/cmd_run_list.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_stdin.txt → cmd/cue/cmd/testdata/script/cmd_stdin.txtar b/cmd/cue/cmd/testdata/script/cmd_stdin.txt → cmd/cue/cmd/testdata/script/cmd_stdin.txtar
diff --git a/cmd/cue/cmd/testdata/script/cmd_tags.txt → cmd/cue/cmd/testdata/script/cmd_tags.txtar b/cmd/cue/cmd/testdata/script/cmd_tags.txt → cmd/cue/cmd/testdata/script/cmd_tags.txtar
diff --git a/...cue/cmd/testdata/script/cmd_textproto.txt → ...e/cmd/testdata/script/cmd_textproto.txtar b/...cue/cmd/testdata/script/cmd_textproto.txt → ...e/cmd/testdata/script/cmd_textproto.txtar
diff --git a/cmd/cue/cmd/testdata/script/def_basic.txt → cmd/cue/cmd/testdata/script/def_basic.txtar b/cmd/cue/cmd/testdata/script/def_basic.txt → cmd/cue/cmd/testdata/script/def_basic.txtar
diff --git a/cmd/cue/cmd/testdata/script/def_force.txt → cmd/cue/cmd/testdata/script/def_force.txtar b/cmd/cue/cmd/testdata/script/def_force.txt → cmd/cue/cmd/testdata/script/def_force.txtar
diff --git a/cmd/cue/cmd/testdata/script/def_inline.txt → cmd/cue/cmd/testdata/script/def_inline.txtar b/cmd/cue/cmd/testdata/script/def_inline.txt → cmd/cue/cmd/testdata/script/def_inline.txtar
diff --git a/...ue/cmd/testdata/script/def_jsonschema.txt → .../cmd/testdata/script/def_jsonschema.txtar b/...ue/cmd/testdata/script/def_jsonschema.txt → .../cmd/testdata/script/def_jsonschema.txtar
diff --git a/cmd/cue/cmd/testdata/script/def_openapi.txt → ...cue/cmd/testdata/script/def_openapi.txtar b/cmd/cue/cmd/testdata/script/def_openapi.txt → ...cue/cmd/testdata/script/def_openapi.txtar
diff --git a/cmd/cue/cmd/testdata/script/def_proto.txt → cmd/cue/cmd/testdata/script/def_proto.txtar b/cmd/cue/cmd/testdata/script/def_proto.txt → cmd/cue/cmd/testdata/script/def_proto.txtar
diff --git a/...cue/cmd/testdata/script/eval_concrete.txt → ...e/cmd/testdata/script/eval_concrete.txtar b/...cue/cmd/testdata/script/eval_concrete.txt → ...e/cmd/testdata/script/eval_concrete.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_context.txt → ...ue/cmd/testdata/script/eval_context.txtar b/cmd/cue/cmd/testdata/script/eval_context.txt → ...ue/cmd/testdata/script/eval_context.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_datapkg.txt → ...ue/cmd/testdata/script/eval_datapkg.txtar b/cmd/cue/cmd/testdata/script/eval_datapkg.txt → ...ue/cmd/testdata/script/eval_datapkg.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_e.txt → cmd/cue/cmd/testdata/script/eval_e.txtar b/cmd/cue/cmd/testdata/script/eval_e.txt → cmd/cue/cmd/testdata/script/eval_e.txtar
diff --git a/...cue/cmd/testdata/script/eval_e_hidden.txt → ...e/cmd/testdata/script/eval_e_hidden.txtar b/...cue/cmd/testdata/script/eval_e_hidden.txt → ...e/cmd/testdata/script/eval_e_hidden.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_errs.txt → cmd/cue/cmd/testdata/script/eval_errs.txtar b/cmd/cue/cmd/testdata/script/eval_errs.txt → cmd/cue/cmd/testdata/script/eval_errs.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_expr.txt → cmd/cue/cmd/testdata/script/eval_expr.txtar b/cmd/cue/cmd/testdata/script/eval_expr.txt → cmd/cue/cmd/testdata/script/eval_expr.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_flags.txt → cmd/cue/cmd/testdata/script/eval_flags.txtar b/cmd/cue/cmd/testdata/script/eval_flags.txt → cmd/cue/cmd/testdata/script/eval_flags.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_force.txt → cmd/cue/cmd/testdata/script/eval_force.txtar b/cmd/cue/cmd/testdata/script/eval_force.txt → cmd/cue/cmd/testdata/script/eval_force.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_hidden.txt → ...cue/cmd/testdata/script/eval_hidden.txtar b/cmd/cue/cmd/testdata/script/eval_hidden.txt → ...cue/cmd/testdata/script/eval_hidden.txtar
diff --git a/...e/cmd/testdata/script/eval_hiddenfail.txt → ...cmd/testdata/script/eval_hiddenfail.txtar b/...e/cmd/testdata/script/eval_hiddenfail.txt → ...cmd/testdata/script/eval_hiddenfail.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_import.txt → ...cue/cmd/testdata/script/eval_import.txtar b/cmd/cue/cmd/testdata/script/eval_import.txt → ...cue/cmd/testdata/script/eval_import.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_loaderr.txt → ...ue/cmd/testdata/script/eval_loaderr.txtar b/cmd/cue/cmd/testdata/script/eval_loaderr.txt → ...ue/cmd/testdata/script/eval_loaderr.txtar
diff --git a/...d/testdata/script/eval_mixedfiletypes.txt → ...testdata/script/eval_mixedfiletypes.txtar b/...d/testdata/script/eval_mixedfiletypes.txt → ...testdata/script/eval_mixedfiletypes.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_newline.txt → ...ue/cmd/testdata/script/eval_newline.txtar b/cmd/cue/cmd/testdata/script/eval_newline.txt → ...ue/cmd/testdata/script/eval_newline.txtar
diff --git a/...md/testdata/script/eval_notexistfatal.txt → .../testdata/script/eval_notexistfatal.txtar b/...md/testdata/script/eval_notexistfatal.txt → .../testdata/script/eval_notexistfatal.txtar
diff --git a/...stdata/script/eval_notexistincomplete.txt → ...data/script/eval_notexistincomplete.txtar b/...stdata/script/eval_notexistincomplete.txt → ...data/script/eval_notexistincomplete.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_rec.txt → cmd/cue/cmd/testdata/script/eval_rec.txtar b/cmd/cue/cmd/testdata/script/eval_rec.txt → cmd/cue/cmd/testdata/script/eval_rec.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_resolve.txt → ...ue/cmd/testdata/script/eval_resolve.txtar b/cmd/cue/cmd/testdata/script/eval_resolve.txt → ...ue/cmd/testdata/script/eval_resolve.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_stdin.txt → cmd/cue/cmd/testdata/script/eval_stdin.txtar b/cmd/cue/cmd/testdata/script/eval_stdin.txt → cmd/cue/cmd/testdata/script/eval_stdin.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_tags.txt → cmd/cue/cmd/testdata/script/eval_tags.txtar b/cmd/cue/cmd/testdata/script/eval_tags.txt → cmd/cue/cmd/testdata/script/eval_tags.txtar
diff --git a/cmd/cue/cmd/testdata/script/eval_tool.txt → cmd/cue/cmd/testdata/script/eval_tool.txtar b/cmd/cue/cmd/testdata/script/eval_tool.txt → cmd/cue/cmd/testdata/script/eval_tool.txtar
diff --git a/cmd/cue/cmd/testdata/script/export.txt → cmd/cue/cmd/testdata/script/export.txtar b/cmd/cue/cmd/testdata/script/export.txt → cmd/cue/cmd/testdata/script/export.txtar
diff --git a/...cmd/testdata/script/export_defaulterr.txt → ...d/testdata/script/export_defaulterr.txtar b/...cmd/testdata/script/export_defaulterr.txt → ...d/testdata/script/export_defaulterr.txtar
diff --git a/cmd/cue/cmd/testdata/script/export_err.txt → cmd/cue/cmd/testdata/script/export_err.txtar b/cmd/cue/cmd/testdata/script/export_err.txt → cmd/cue/cmd/testdata/script/export_err.txtar
diff --git a/cmd/cue/cmd/testdata/script/export_expr.txt → ...cue/cmd/testdata/script/export_expr.txtar b/cmd/cue/cmd/testdata/script/export_expr.txt → ...cue/cmd/testdata/script/export_expr.txtar
diff --git a/cmd/cue/cmd/testdata/script/export_force.txt → ...ue/cmd/testdata/script/export_force.txtar b/cmd/cue/cmd/testdata/script/export_force.txt → ...ue/cmd/testdata/script/export_force.txtar
diff --git a/...cmd/testdata/script/export_incomplete.txt → ...d/testdata/script/export_incomplete.txtar b/...cmd/testdata/script/export_incomplete.txt → ...d/testdata/script/export_incomplete.txtar
diff --git a/cmd/cue/cmd/testdata/script/export_list.txt → ...cue/cmd/testdata/script/export_list.txtar b/cmd/cue/cmd/testdata/script/export_list.txt → ...cue/cmd/testdata/script/export_list.txtar
diff --git a/...cue/cmd/testdata/script/export_select.txt → ...e/cmd/testdata/script/export_select.txtar b/...cue/cmd/testdata/script/export_select.txt → ...e/cmd/testdata/script/export_select.txtar
diff --git a/cmd/cue/cmd/testdata/script/export_yaml.txt → ...cue/cmd/testdata/script/export_yaml.txtar b/cmd/cue/cmd/testdata/script/export_yaml.txt → ...cue/cmd/testdata/script/export_yaml.txtar
diff --git a/cmd/cue/cmd/testdata/script/file_forms.txt → cmd/cue/cmd/testdata/script/file_forms.txtar b/cmd/cue/cmd/testdata/script/file_forms.txt → cmd/cue/cmd/testdata/script/file_forms.txtar
diff --git a/cmd/cue/cmd/testdata/script/fix.txt → cmd/cue/cmd/testdata/script/fix.txtar b/cmd/cue/cmd/testdata/script/fix.txt → cmd/cue/cmd/testdata/script/fix.txtar
diff --git a/cmd/cue/cmd/testdata/script/fix_files.txt → cmd/cue/cmd/testdata/script/fix_files.txtar b/cmd/cue/cmd/testdata/script/fix_files.txt → cmd/cue/cmd/testdata/script/fix_files.txtar
diff --git a/cmd/cue/cmd/testdata/script/fix_pkg.txt → cmd/cue/cmd/testdata/script/fix_pkg.txtar b/cmd/cue/cmd/testdata/script/fix_pkg.txt → cmd/cue/cmd/testdata/script/fix_pkg.txtar
diff --git a/cmd/cue/cmd/testdata/script/fmt.txt → cmd/cue/cmd/testdata/script/fmt.txtar b/cmd/cue/cmd/testdata/script/fmt.txt → cmd/cue/cmd/testdata/script/fmt.txtar
diff --git a/cmd/cue/cmd/testdata/script/fmt_err.txt → cmd/cue/cmd/testdata/script/fmt_err.txtar b/cmd/cue/cmd/testdata/script/fmt_err.txt → cmd/cue/cmd/testdata/script/fmt_err.txtar
diff --git a/...cue/cmd/testdata/script/fmt_issue1553.txt → ...e/cmd/testdata/script/fmt_issue1553.txtar b/...cue/cmd/testdata/script/fmt_issue1553.txt → ...e/cmd/testdata/script/fmt_issue1553.txtar
diff --git a/cmd/cue/cmd/testdata/script/fmt_multi.txt → cmd/cue/cmd/testdata/script/fmt_multi.txtar b/cmd/cue/cmd/testdata/script/fmt_multi.txt → cmd/cue/cmd/testdata/script/fmt_multi.txtar
diff --git a/cmd/cue/cmd/testdata/script/fmt_stdin.txt → cmd/cue/cmd/testdata/script/fmt_stdin.txtar b/cmd/cue/cmd/testdata/script/fmt_stdin.txt → cmd/cue/cmd/testdata/script/fmt_stdin.txtar
diff --git a/cmd/cue/cmd/testdata/script/get_go_anon.txt → ...cue/cmd/testdata/script/get_go_anon.txtar b/cmd/cue/cmd/testdata/script/get_go_anon.txt → ...cue/cmd/testdata/script/get_go_anon.txtar
diff --git a/.../cmd/testdata/script/get_go_bad_embed.txt → ...md/testdata/script/get_go_bad_embed.txtar b/.../cmd/testdata/script/get_go_bad_embed.txt → ...md/testdata/script/get_go_bad_embed.txtar
diff --git a/cmd/cue/cmd/testdata/script/get_go_local.txt → ...ue/cmd/testdata/script/get_go_local.txtar b/cmd/cue/cmd/testdata/script/get_go_local.txt → ...ue/cmd/testdata/script/get_go_local.txtar
diff --git a/.../cmd/testdata/script/get_go_non_local.txt → ...md/testdata/script/get_go_non_local.txtar b/.../cmd/testdata/script/get_go_non_local.txt → ...md/testdata/script/get_go_non_local.txtar
diff --git a/...md/testdata/script/get_go_type_errors.txt → .../testdata/script/get_go_type_errors.txtar b/...md/testdata/script/get_go_type_errors.txt → .../testdata/script/get_go_type_errors.txtar
diff --git a/cmd/cue/cmd/testdata/script/get_go_types.txt → ...ue/cmd/testdata/script/get_go_types.txtar b/cmd/cue/cmd/testdata/script/get_go_types.txt → ...ue/cmd/testdata/script/get_go_types.txtar
diff --git a/...ta/script/get_go_unresolvable_package.txt → .../script/get_go_unresolvable_package.txtar b/...ta/script/get_go_unresolvable_package.txt → .../script/get_go_unresolvable_package.txtar
diff --git a/cmd/cue/cmd/testdata/script/go_cmd.txt → cmd/cue/cmd/testdata/script/go_cmd.txtar b/cmd/cue/cmd/testdata/script/go_cmd.txt → cmd/cue/cmd/testdata/script/go_cmd.txtar
diff --git a/cmd/cue/cmd/testdata/script/goproxytest.txt → ...cue/cmd/testdata/script/goproxytest.txtar b/cmd/cue/cmd/testdata/script/goproxytest.txt → ...cue/cmd/testdata/script/goproxytest.txtar
diff --git a/cmd/cue/cmd/testdata/script/help.txt → cmd/cue/cmd/testdata/script/help.txtar b/cmd/cue/cmd/testdata/script/help.txt → cmd/cue/cmd/testdata/script/help.txtar
diff --git a/cmd/cue/cmd/testdata/script/help_cmd.txt → cmd/cue/cmd/testdata/script/help_cmd.txtar b/cmd/cue/cmd/testdata/script/help_cmd.txt → cmd/cue/cmd/testdata/script/help_cmd.txtar
diff --git a/...ue/cmd/testdata/script/help_cmd_flags.txt → .../cmd/testdata/script/help_cmd_flags.txtar b/...ue/cmd/testdata/script/help_cmd_flags.txt → .../cmd/testdata/script/help_cmd_flags.txtar
diff --git a/cmd/cue/cmd/testdata/script/help_doc.txt → cmd/cue/cmd/testdata/script/help_doc.txtar b/cmd/cue/cmd/testdata/script/help_doc.txt → cmd/cue/cmd/testdata/script/help_doc.txtar
diff --git a/cmd/cue/cmd/testdata/script/help_hello.txt → cmd/cue/cmd/testdata/script/help_hello.txtar b/cmd/cue/cmd/testdata/script/help_hello.txt → cmd/cue/cmd/testdata/script/help_hello.txtar
diff --git a/cmd/cue/cmd/testdata/script/hidden.txt → cmd/cue/cmd/testdata/script/hidden.txtar b/cmd/cue/cmd/testdata/script/hidden.txt → cmd/cue/cmd/testdata/script/hidden.txtar
diff --git a/cmd/cue/cmd/testdata/script/import_auto.txt → ...cue/cmd/testdata/script/import_auto.txtar b/cmd/cue/cmd/testdata/script/import_auto.txt → ...cue/cmd/testdata/script/import_auto.txtar
diff --git a/...cue/cmd/testdata/script/import_binary.txt → ...e/cmd/testdata/script/import_binary.txtar b/...cue/cmd/testdata/script/import_binary.txt → ...e/cmd/testdata/script/import_binary.txtar
diff --git a/...ue/cmd/testdata/script/import_context.txt → .../cmd/testdata/script/import_context.txtar b/...ue/cmd/testdata/script/import_context.txt → .../cmd/testdata/script/import_context.txtar
diff --git a/cmd/cue/cmd/testdata/script/import_dir.txt → cmd/cue/cmd/testdata/script/import_dir.txtar b/cmd/cue/cmd/testdata/script/import_dir.txt → cmd/cue/cmd/testdata/script/import_dir.txtar
diff --git a/cmd/cue/cmd/testdata/script/import_files.txt → ...ue/cmd/testdata/script/import_files.txtar b/cmd/cue/cmd/testdata/script/import_files.txt → ...ue/cmd/testdata/script/import_files.txtar
diff --git a/...e/cmd/testdata/script/import_hoiststr.txt → ...cmd/testdata/script/import_hoiststr.txtar b/...e/cmd/testdata/script/import_hoiststr.txt → ...cmd/testdata/script/import_hoiststr.txtar
diff --git a/cmd/cue/cmd/testdata/script/import_list.txt → ...cue/cmd/testdata/script/import_list.txtar b/cmd/cue/cmd/testdata/script/import_list.txt → ...cue/cmd/testdata/script/import_list.txtar
diff --git a/cmd/cue/cmd/testdata/script/import_match.txt → ...ue/cmd/testdata/script/import_match.txtar b/cmd/cue/cmd/testdata/script/import_match.txt → ...ue/cmd/testdata/script/import_match.txtar
diff --git a/cmd/cue/cmd/testdata/script/import_merge.txt → ...ue/cmd/testdata/script/import_merge.txtar b/cmd/cue/cmd/testdata/script/import_merge.txt → ...ue/cmd/testdata/script/import_merge.txtar
diff --git a/cmd/cue/cmd/testdata/script/import_path.txt → ...cue/cmd/testdata/script/import_path.txtar b/cmd/cue/cmd/testdata/script/import_path.txt → ...cue/cmd/testdata/script/import_path.txtar
diff --git a/cmd/cue/cmd/testdata/script/import_proto.txt → ...ue/cmd/testdata/script/import_proto.txtar b/cmd/cue/cmd/testdata/script/import_proto.txt → ...ue/cmd/testdata/script/import_proto.txtar
diff --git a/...cue/cmd/testdata/script/import_proto2.txt → ...e/cmd/testdata/script/import_proto2.txtar b/...cue/cmd/testdata/script/import_proto2.txt → ...e/cmd/testdata/script/import_proto2.txtar
diff --git a/cmd/cue/cmd/testdata/script/inject.txt → cmd/cue/cmd/testdata/script/inject.txtar b/cmd/cue/cmd/testdata/script/inject.txt → cmd/cue/cmd/testdata/script/inject.txtar
diff --git a/cmd/cue/cmd/testdata/script/injecterr.txt → cmd/cue/cmd/testdata/script/injecterr.txtar b/cmd/cue/cmd/testdata/script/injecterr.txt → cmd/cue/cmd/testdata/script/injecterr.txtar
diff --git a/cmd/cue/cmd/testdata/script/install.txt → cmd/cue/cmd/testdata/script/install.txtar b/cmd/cue/cmd/testdata/script/install.txt → cmd/cue/cmd/testdata/script/install.txtar
diff --git a/.../testdata/script/install_contributing.txt → ...estdata/script/install_contributing.txtar b/.../testdata/script/install_contributing.txt → ...estdata/script/install_contributing.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue116.txt → cmd/cue/cmd/testdata/script/issue116.txtar b/cmd/cue/cmd/testdata/script/issue116.txt → cmd/cue/cmd/testdata/script/issue116.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue1270.txt → cmd/cue/cmd/testdata/script/issue1270.txtar b/cmd/cue/cmd/testdata/script/issue1270.txt → cmd/cue/cmd/testdata/script/issue1270.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue174.txt → cmd/cue/cmd/testdata/script/issue174.txtar b/cmd/cue/cmd/testdata/script/issue174.txt → cmd/cue/cmd/testdata/script/issue174.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue217.txt → cmd/cue/cmd/testdata/script/issue217.txtar b/cmd/cue/cmd/testdata/script/issue217.txt → cmd/cue/cmd/testdata/script/issue217.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue236.txt → cmd/cue/cmd/testdata/script/issue236.txtar b/cmd/cue/cmd/testdata/script/issue236.txt → cmd/cue/cmd/testdata/script/issue236.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue269.txt → cmd/cue/cmd/testdata/script/issue269.txtar b/cmd/cue/cmd/testdata/script/issue269.txt → cmd/cue/cmd/testdata/script/issue269.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue289.txt → cmd/cue/cmd/testdata/script/issue289.txtar b/cmd/cue/cmd/testdata/script/issue289.txt → cmd/cue/cmd/testdata/script/issue289.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue302.txt → cmd/cue/cmd/testdata/script/issue302.txtar b/cmd/cue/cmd/testdata/script/issue302.txt → cmd/cue/cmd/testdata/script/issue302.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue303.txt → cmd/cue/cmd/testdata/script/issue303.txtar b/cmd/cue/cmd/testdata/script/issue303.txt → cmd/cue/cmd/testdata/script/issue303.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue304.txt → cmd/cue/cmd/testdata/script/issue304.txtar b/cmd/cue/cmd/testdata/script/issue304.txt → cmd/cue/cmd/testdata/script/issue304.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue312.txt → cmd/cue/cmd/testdata/script/issue312.txtar b/cmd/cue/cmd/testdata/script/issue312.txt → cmd/cue/cmd/testdata/script/issue312.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue315.txt → cmd/cue/cmd/testdata/script/issue315.txtar b/cmd/cue/cmd/testdata/script/issue315.txt → cmd/cue/cmd/testdata/script/issue315.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue322.txt → cmd/cue/cmd/testdata/script/issue322.txtar b/cmd/cue/cmd/testdata/script/issue322.txt → cmd/cue/cmd/testdata/script/issue322.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue324.txt → cmd/cue/cmd/testdata/script/issue324.txtar b/cmd/cue/cmd/testdata/script/issue324.txt → cmd/cue/cmd/testdata/script/issue324.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue398.txt → cmd/cue/cmd/testdata/script/issue398.txtar b/cmd/cue/cmd/testdata/script/issue398.txt → cmd/cue/cmd/testdata/script/issue398.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue425.txt → cmd/cue/cmd/testdata/script/issue425.txtar b/cmd/cue/cmd/testdata/script/issue425.txt → cmd/cue/cmd/testdata/script/issue425.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue461.txt → cmd/cue/cmd/testdata/script/issue461.txtar b/cmd/cue/cmd/testdata/script/issue461.txt → cmd/cue/cmd/testdata/script/issue461.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue473.txt → cmd/cue/cmd/testdata/script/issue473.txtar b/cmd/cue/cmd/testdata/script/issue473.txt → cmd/cue/cmd/testdata/script/issue473.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue476.txt → cmd/cue/cmd/testdata/script/issue476.txtar b/cmd/cue/cmd/testdata/script/issue476.txt → cmd/cue/cmd/testdata/script/issue476.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue477.txt → cmd/cue/cmd/testdata/script/issue477.txtar b/cmd/cue/cmd/testdata/script/issue477.txt → cmd/cue/cmd/testdata/script/issue477.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue512.txt → cmd/cue/cmd/testdata/script/issue512.txtar b/cmd/cue/cmd/testdata/script/issue512.txt → cmd/cue/cmd/testdata/script/issue512.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue520.txt → cmd/cue/cmd/testdata/script/issue520.txtar b/cmd/cue/cmd/testdata/script/issue520.txt → cmd/cue/cmd/testdata/script/issue520.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue525.txt → cmd/cue/cmd/testdata/script/issue525.txtar b/cmd/cue/cmd/testdata/script/issue525.txt → cmd/cue/cmd/testdata/script/issue525.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue526.txt → cmd/cue/cmd/testdata/script/issue526.txtar b/cmd/cue/cmd/testdata/script/issue526.txt → cmd/cue/cmd/testdata/script/issue526.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue749.txt → cmd/cue/cmd/testdata/script/issue749.txtar b/cmd/cue/cmd/testdata/script/issue749.txt → cmd/cue/cmd/testdata/script/issue749.txtar
diff --git a/cmd/cue/cmd/testdata/script/issue986.txt → cmd/cue/cmd/testdata/script/issue986.txtar b/cmd/cue/cmd/testdata/script/issue986.txt → cmd/cue/cmd/testdata/script/issue986.txtar
diff --git a/cmd/cue/cmd/testdata/script/load_pkg.txt → cmd/cue/cmd/testdata/script/load_pkg.txtar b/cmd/cue/cmd/testdata/script/load_pkg.txt → cmd/cue/cmd/testdata/script/load_pkg.txtar
diff --git a/...cmd/testdata/script/merge_interaction.txt → ...d/testdata/script/merge_interaction.txtar b/...cmd/testdata/script/merge_interaction.txt → ...d/testdata/script/merge_interaction.txtar
diff --git a/...cue/cmd/testdata/script/no_read_stdin.txt → ...e/cmd/testdata/script/no_read_stdin.txtar b/...cue/cmd/testdata/script/no_read_stdin.txt → ...e/cmd/testdata/script/no_read_stdin.txtar
diff --git a/cmd/cue/cmd/testdata/script/toolonly.txt → cmd/cue/cmd/testdata/script/toolonly.txtar b/cmd/cue/cmd/testdata/script/toolonly.txt → cmd/cue/cmd/testdata/script/toolonly.txtar
diff --git a/cmd/cue/cmd/testdata/script/trim.txt → cmd/cue/cmd/testdata/script/trim.txtar b/cmd/cue/cmd/testdata/script/trim.txt → cmd/cue/cmd/testdata/script/trim.txtar
diff --git a/cmd/cue/cmd/testdata/script/trim_force.txt → cmd/cue/cmd/testdata/script/trim_force.txtar b/cmd/cue/cmd/testdata/script/trim_force.txt → cmd/cue/cmd/testdata/script/trim_force.txtar
diff --git a/cmd/cue/cmd/testdata/script/version.txt → cmd/cue/cmd/testdata/script/version.txtar b/cmd/cue/cmd/testdata/script/version.txt → cmd/cue/cmd/testdata/script/version.txtar
diff --git a/cmd/cue/cmd/testdata/script/vet.txt → cmd/cue/cmd/testdata/script/vet.txtar b/cmd/cue/cmd/testdata/script/vet.txt → cmd/cue/cmd/testdata/script/vet.txtar
diff --git a/cmd/cue/cmd/testdata/script/vet_altdata.txt → ...cue/cmd/testdata/script/vet_altdata.txtar b/cmd/cue/cmd/testdata/script/vet_altdata.txt → ...cue/cmd/testdata/script/vet_altdata.txtar
diff --git a/cmd/cue/cmd/testdata/script/vet_concrete.txt → ...ue/cmd/testdata/script/vet_concrete.txtar b/cmd/cue/cmd/testdata/script/vet_concrete.txt → ...ue/cmd/testdata/script/vet_concrete.txtar
diff --git a/cmd/cue/cmd/testdata/script/vet_data.txt → cmd/cue/cmd/testdata/script/vet_data.txtar b/cmd/cue/cmd/testdata/script/vet_data.txt → cmd/cue/cmd/testdata/script/vet_data.txtar
diff --git a/...e/cmd/testdata/script/vet_disjunction.txt → ...cmd/testdata/script/vet_disjunction.txtar b/...e/cmd/testdata/script/vet_disjunction.txt → ...cmd/testdata/script/vet_disjunction.txtar
diff --git a/cmd/cue/cmd/testdata/script/vet_embed.txt → cmd/cue/cmd/testdata/script/vet_embed.txtar b/cmd/cue/cmd/testdata/script/vet_embed.txt → cmd/cue/cmd/testdata/script/vet_embed.txtar
diff --git a/cmd/cue/cmd/testdata/script/vet_expr.txt → cmd/cue/cmd/testdata/script/vet_expr.txtar b/cmd/cue/cmd/testdata/script/vet_expr.txt → cmd/cue/cmd/testdata/script/vet_expr.txtar
diff --git a/cmd/cue/cmd/testdata/script/vet_file.txt → cmd/cue/cmd/testdata/script/vet_file.txtar b/cmd/cue/cmd/testdata/script/vet_file.txt → cmd/cue/cmd/testdata/script/vet_file.txtar
diff --git a/cmd/cue/cmd/testdata/script/vet_opt.txt → cmd/cue/cmd/testdata/script/vet_opt.txtar b/cmd/cue/cmd/testdata/script/vet_opt.txt → cmd/cue/cmd/testdata/script/vet_opt.txtar
diff --git a/cmd/cue/cmd/testdata/script/vet_path.txt → cmd/cue/cmd/testdata/script/vet_path.txtar b/cmd/cue/cmd/testdata/script/vet_path.txt → cmd/cue/cmd/testdata/script/vet_path.txtar
diff --git a/cmd/cue/cmd/testdata/script/vet_yaml.txt → cmd/cue/cmd/testdata/script/vet_yaml.txtar b/cmd/cue/cmd/testdata/script/vet_yaml.txt → cmd/cue/cmd/testdata/script/vet_yaml.txtar
diff --git 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.
 
-<!-- Keep the following in sync with cmd/cue/cmd/testdata/script/contributing_install*.txt -->
+<!-- Keep the following in sync with cmd/cue/cmd/testdata/script/contributing_install*.txtar -->
 
 Install the `git-codereview` command by running,
 

diff --git a/doc/install.md b/doc/install.md
@@ -10,7 +10,7 @@ Go 1.17 or higher (see below)
 
 ### Installing CUE
 
-<!-- Keep the following in sync with cmd/cue/cmd/testdata/script/install*.txt -->
+<!-- Keep the following in sync with cmd/cue/cmd/testdata/script/install*.txtar -->
 
 To download and install the `cue` command line tool run
 

diff --git a/doc/tutorial/basics/0_intro/10_json.txt → doc/tutorial/basics/0_intro/10_json.txtarar b/doc/tutorial/basics/0_intro/10_json.txt → doc/tutorial/basics/0_intro/10_json.txtarar
diff --git a/doc/tutorial/basics/0_intro/20_cue.txt → doc/tutorial/basics/0_intro/20_cue.txtar b/doc/tutorial/basics/0_intro/20_cue.txt → doc/tutorial/basics/0_intro/20_cue.txtar
diff --git a/...tutorial/basics/0_intro/30_duplicates.txt → ...torial/basics/0_intro/30_duplicates.txtar b/...tutorial/basics/0_intro/30_duplicates.txt → ...torial/basics/0_intro/30_duplicates.txtar
diff --git a/...utorial/basics/0_intro/40_constraints.txt → ...orial/basics/0_intro/40_constraints.txtar b/...utorial/basics/0_intro/40_constraints.txt → ...orial/basics/0_intro/40_constraints.txtar
diff --git a/doc/tutorial/basics/0_intro/43_schema.txt → doc/tutorial/basics/0_intro/43_schema.txtar b/doc/tutorial/basics/0_intro/43_schema.txt → doc/tutorial/basics/0_intro/43_schema.txtar
diff --git a/...tutorial/basics/0_intro/47_validation.txt → ...torial/basics/0_intro/47_validation.txtar b/...tutorial/basics/0_intro/47_validation.txt → ...torial/basics/0_intro/47_validation.txtar
diff --git a/doc/tutorial/basics/0_intro/50_order.txt → doc/tutorial/basics/0_intro/50_order.txtar b/doc/tutorial/basics/0_intro/50_order.txt → doc/tutorial/basics/0_intro/50_order.txtar
diff --git a/doc/tutorial/basics/0_intro/55_fold.txt → doc/tutorial/basics/0_intro/55_fold.txtar b/doc/tutorial/basics/0_intro/55_fold.txt → doc/tutorial/basics/0_intro/55_fold.txtar
diff --git a/...utorial/basics/0_intro/80_boilerplate.txt → ...orial/basics/0_intro/80_boilerplate.txtar b/...utorial/basics/0_intro/80_boilerplate.txt → ...orial/basics/0_intro/80_boilerplate.txtar
diff --git a/doc/tutorial/basics/2_types/05_types.txt → doc/tutorial/basics/2_types/05_types.txtar b/doc/tutorial/basics/2_types/05_types.txt → doc/tutorial/basics/2_types/05_types.txtar
diff --git a/doc/tutorial/basics/2_types/20_bottom.txt → doc/tutorial/basics/2_types/20_bottom.txtar b/doc/tutorial/basics/2_types/20_bottom.txt → doc/tutorial/basics/2_types/20_bottom.txtar
diff --git a/doc/tutorial/basics/2_types/30_numbers.txt → doc/tutorial/basics/2_types/30_numbers.txtar b/doc/tutorial/basics/2_types/30_numbers.txt → doc/tutorial/basics/2_types/30_numbers.txtar
diff --git a/doc/tutorial/basics/2_types/40_stringlit.txt → ...utorial/basics/2_types/40_stringlit.txtar b/doc/tutorial/basics/2_types/40_stringlit.txt → ...utorial/basics/2_types/40_stringlit.txtar
diff --git a/doc/tutorial/basics/2_types/45_stringraw.txt → ...utorial/basics/2_types/45_stringraw.txtar b/doc/tutorial/basics/2_types/45_stringraw.txt → ...utorial/basics/2_types/45_stringraw.txtar
diff --git a/doc/tutorial/basics/2_types/48_bytes.txt → doc/tutorial/basics/2_types/48_bytes.txtar b/doc/tutorial/basics/2_types/48_bytes.txt → doc/tutorial/basics/2_types/48_bytes.txtar
diff --git a/doc/tutorial/basics/2_types/50_closed.txt → doc/tutorial/basics/2_types/50_closed.txtar b/doc/tutorial/basics/2_types/50_closed.txt → doc/tutorial/basics/2_types/50_closed.txtar
diff --git a/doc/tutorial/basics/2_types/55_defs.txt → doc/tutorial/basics/2_types/55_defs.txtar b/doc/tutorial/basics/2_types/55_defs.txt → doc/tutorial/basics/2_types/55_defs.txtar
diff --git a/doc/tutorial/basics/2_types/56_optional.txt → ...tutorial/basics/2_types/56_optional.txtar b/doc/tutorial/basics/2_types/56_optional.txt → ...tutorial/basics/2_types/56_optional.txtar
diff --git a/...torial/basics/2_types/60_disjunctions.txt → ...rial/basics/2_types/60_disjunctions.txtar b/...torial/basics/2_types/60_disjunctions.txt → ...rial/basics/2_types/60_disjunctions.txtar
diff --git a/doc/tutorial/basics/2_types/65_defaults.txt → ...tutorial/basics/2_types/65_defaults.txtar b/doc/tutorial/basics/2_types/65_defaults.txt → ...tutorial/basics/2_types/65_defaults.txtar
diff --git a/doc/tutorial/basics/2_types/65_sumstruct.txt → ...utorial/basics/2_types/65_sumstruct.txtar b/doc/tutorial/basics/2_types/65_sumstruct.txt → ...utorial/basics/2_types/65_sumstruct.txtar
diff --git a/doc/tutorial/basics/2_types/70_bounds.txt → doc/tutorial/basics/2_types/70_bounds.txtar b/doc/tutorial/basics/2_types/70_bounds.txt → doc/tutorial/basics/2_types/70_bounds.txtar
diff --git a/doc/tutorial/basics/2_types/75_bounddef.txt → ...tutorial/basics/2_types/75_bounddef.txtar b/doc/tutorial/basics/2_types/75_bounddef.txt → ...tutorial/basics/2_types/75_bounddef.txtar
diff --git a/doc/tutorial/basics/2_types/80_lists.txt → doc/tutorial/basics/2_types/80_lists.txtar b/doc/tutorial/basics/2_types/80_lists.txt → doc/tutorial/basics/2_types/80_lists.txtar
diff --git a/doc/tutorial/basics/2_types/90_templates.txt → ...utorial/basics/2_types/90_templates.txtar b/doc/tutorial/basics/2_types/90_templates.txt → ...utorial/basics/2_types/90_templates.txtar
diff --git a/...utorial/basics/4_references/10_scopes.txt → ...orial/basics/4_references/10_scopes.txtar b/...utorial/basics/4_references/10_scopes.txt → ...orial/basics/4_references/10_scopes.txtar
diff --git a/...rial/basics/4_references/20_selectors.txt → ...al/basics/4_references/20_selectors.txtar b/...rial/basics/4_references/20_selectors.txt → ...al/basics/4_references/20_selectors.txtar
diff --git a/...torial/basics/4_references/30_aliases.txt → ...rial/basics/4_references/30_aliases.txtar b/...torial/basics/4_references/30_aliases.txt → ...rial/basics/4_references/30_aliases.txtar
diff --git a/doc/tutorial/basics/4_references/50_emit.txt → ...utorial/basics/4_references/50_emit.txtar b/doc/tutorial/basics/4_references/50_emit.txt → ...utorial/basics/4_references/50_emit.txtar
diff --git a/...tutorial/basics/4_references/80_cycle.txt → ...torial/basics/4_references/80_cycle.txtar b/...tutorial/basics/4_references/80_cycle.txt → ...torial/basics/4_references/80_cycle.txtar
diff --git a/...orial/basics/4_references/85_cycleref.txt → ...ial/basics/4_references/85_cycleref.txtar b/...orial/basics/4_references/85_cycleref.txt → ...ial/basics/4_references/85_cycleref.txtar
diff --git a/...utorial/basics/4_references/99_hidden.txt → ...orial/basics/4_references/99_hidden.txtar b/...utorial/basics/4_references/99_hidden.txt → ...orial/basics/4_references/99_hidden.txtar
diff --git a/...ial/basics/6_expressions/10_operators.txt → ...l/basics/6_expressions/10_operators.txtar b/...ial/basics/6_expressions/10_operators.txt → ...l/basics/6_expressions/10_operators.txtar
diff --git a/...basics/6_expressions/20_interpolation.txt → ...sics/6_expressions/20_interpolation.txtar b/...basics/6_expressions/20_interpolation.txt → ...sics/6_expressions/20_interpolation.txtar
diff --git a/...basics/6_expressions/25_interpolfield.txt → ...sics/6_expressions/25_interpolfield.txtar b/...basics/6_expressions/25_interpolfield.txt → ...sics/6_expressions/25_interpolfield.txtar
diff --git a/...rial/basics/6_expressions/40_listcomp.txt → ...al/basics/6_expressions/40_listcomp.txtar b/...rial/basics/6_expressions/40_listcomp.txt → ...al/basics/6_expressions/40_listcomp.txtar
diff --git a/...ial/basics/6_expressions/50_fieldcomp.txt → ...l/basics/6_expressions/50_fieldcomp.txtar b/...ial/basics/6_expressions/50_fieldcomp.txt → ...l/basics/6_expressions/50_fieldcomp.txtar
diff --git a/...l/basics/6_expressions/55_conditional.txt → ...basics/6_expressions/55_conditional.txtar b/...l/basics/6_expressions/55_conditional.txt → ...basics/6_expressions/55_conditional.txtar
diff --git a/...torial/basics/6_expressions/70_regexp.txt → ...rial/basics/6_expressions/70_regexp.txtar b/...torial/basics/6_expressions/70_regexp.txt → ...rial/basics/6_expressions/70_regexp.txtar
diff --git a/...rial/basics/6_expressions/80_coalesce.txt → ...al/basics/6_expressions/80_coalesce.txtar b/...rial/basics/6_expressions/80_coalesce.txt → ...al/basics/6_expressions/80_coalesce.txtar
diff --git a/...utorial/basics/8_packages/10_packages.txt → ...orial/basics/8_packages/10_packages.txtar b/...utorial/basics/8_packages/10_packages.txt → ...orial/basics/8_packages/10_packages.txtar
diff --git a/...tutorial/basics/8_packages/30_imports.txt → ...torial/basics/8_packages/30_imports.txtar b/...tutorial/basics/8_packages/30_imports.txt → ...torial/basics/8_packages/30_imports.txtar
diff --git 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
@@ -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
@@ -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=