Skip to content

Commit da35a8b

Browse files
committed
Use struct formatting
1 parent 254a02d commit da35a8b

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

src/main/java/com/google/devtools/build/lib/analysis/FileProvider.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ public boolean isImmutable() {
5757

5858
@Override
5959
public void debugPrint(Printer printer, StarlarkThread thread) {
60-
printer.append("<FileProvider files_to_build=");
61-
printer.repr(getFilesToBuildForStarlark());
62-
printer.append(">");
60+
printer.append("file_provider(files_to_build = ");
61+
printer.debugPrint(getFilesToBuildForStarlark(), thread);
62+
printer.append(")");
6363
}
6464

6565
public NestedSet<Artifact> getFilesToBuild() {

src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@ public Artifact getRepoMappingManifest() {
110110

111111
@Override
112112
public void debugPrint(Printer printer, StarlarkThread thread) {
113-
printer.append("<FilesToRunProvider executable=");
114-
printer.repr(getExecutable());
115-
printer.append(", runfiles_manifest=");
116-
printer.repr(getRunfilesManifest());
117-
printer.append(", repo_mapping_manifest=");
118-
printer.repr(getRepoMappingManifest());
119-
printer.append(">");
113+
printer.append("FilesToRunProvider(executable = ");
114+
printer.debugPrint(getExecutable(), thread);
115+
printer.append(", repo_mapping_manifest = ");
116+
printer.debugPrint(getRepoMappingManifest(), thread);
117+
printer.append(", runfiles_manifest = ");
118+
printer.debugPrint(getRunfilesManifest(), thread);
119+
printer.append(")");
120120
}
121121

122122
/** A single executable. */

src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -1154,14 +1154,14 @@ String describeFingerprint(boolean digestAbsolutePaths) {
11541154

11551155
@Override
11561156
public void debugPrint(Printer printer, StarlarkThread thread) {
1157-
printer.append("<runfiles files=");
1158-
printer.repr(getArtifactsForStarlark());
1159-
printer.append(", symlinks=");
1160-
printer.repr(getSymlinksForStarlark());
1161-
printer.append(", root_symlinks=");
1162-
printer.repr(getRootSymlinksForStarlark());
1163-
printer.append(", empty_files=");
1164-
printer.repr(getEmptyFilenamesForStarlark());
1165-
printer.append(">");
1157+
printer.append("runfiles(empty_files = ");
1158+
printer.debugPrint(getEmptyFilenamesForStarlark(), thread);
1159+
printer.append(", files = ");
1160+
printer.debugPrint(getArtifactsForStarlark(), thread);
1161+
printer.append(", root_symlinks = ");
1162+
printer.debugPrint(getRootSymlinksForStarlark(), thread);
1163+
printer.append(", symlinks = ");
1164+
printer.debugPrint(getSymlinksForStarlark(), thread);
1165+
printer.append(")");
11661166
}
11671167
}

0 commit comments

Comments
 (0)