treewide: Fix ENUM_VALUE_PREFIX rule exception
Change-Id: Ibc2fd66711f6aa347e88e2379c12db1898373700
Reviewed-on: https://review.monogon.dev/c/monogon/+/3804
Tested-by: Jenkins CI
Reviewed-by: Leopold Schabel <leo@monogon.tech>
diff --git a/build/bazel_cc_fix/ccfixspec/BUILD.bazel b/build/bazel_cc_fix/ccfixspec/BUILD.bazel
index 55844d3..ee7f11a 100644
--- a/build/bazel_cc_fix/ccfixspec/BUILD.bazel
+++ b/build/bazel_cc_fix/ccfixspec/BUILD.bazel
@@ -7,7 +7,6 @@
name = "build_bazel_cc_fix_ccfixspec_proto_lint_test",
except_rules = [
"PACKAGE_VERSION_SUFFIX",
- "ENUM_VALUE_PREFIX", # TODO: evaluate correctness
"ENUM_ZERO_VALUE_SUFFIX", # TODO: evaluate correctness
],
protos = [":build_bazel_cc_fix_ccfixspec_proto"],
diff --git a/build/bazel_cc_fix/ccfixspec/ccfixspec.proto b/build/bazel_cc_fix/ccfixspec/ccfixspec.proto
index 9f6a8c9..7ec92e3 100644
--- a/build/bazel_cc_fix/ccfixspec/ccfixspec.proto
+++ b/build/bazel_cc_fix/ccfixspec/ccfixspec.proto
@@ -35,15 +35,15 @@
message Replace {
enum Type {
- UNKNOWN = 0;
+ TYPE_UNKNOWN = 0;
// SYSTEM replaces included system headers (within < >) with the given
// workspace or inter-workspace (external/<otherworkspace>) paths. It
// matches literally as these files are generally not resolvable.
- SYSTEM = 1;
+ TYPE_SYSTEM = 1;
// WORKSPACE replaces included workspace-relative headers (after resolving)
// with the given workspace or inter-workspace paths. It matches
// pre-resolved workspace-relative paths.
- WORKSPACE = 2;
+ TYPE_WORKSPACE = 2;
}
Type type = 1;
string from = 2;
diff --git a/build/bazel_cc_fix/main.go b/build/bazel_cc_fix/main.go
index 4292b0d..a83374d 100644
--- a/build/bazel_cc_fix/main.go
+++ b/build/bazel_cc_fix/main.go
@@ -203,12 +203,12 @@
searchPath = quoteIncludes
} else if inclType == "<" {
searchPath = systemIncludes
- workspaceRelativeFilePath = applyReplaceDirectives(spec.Replace, ccfixspec.Replace_SYSTEM, inclFile, false)
+ workspaceRelativeFilePath = applyReplaceDirectives(spec.Replace, ccfixspec.Replace_TYPE_SYSTEM, inclFile, false)
}
if workspaceRelativeFilePath == "" {
workspaceRelativeFilePath = findFileInWorkspace(searchPath, inclFile, isGeneratedFile)
}
- workspaceRelativeFilePath = applyReplaceDirectives(spec.Replace, ccfixspec.Replace_WORKSPACE, workspaceRelativeFilePath, true)
+ workspaceRelativeFilePath = applyReplaceDirectives(spec.Replace, ccfixspec.Replace_TYPE_WORKSPACE, workspaceRelativeFilePath, true)
if workspaceRelativeFilePath == "" {
continue
}