diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java
index a7d14a2..aa09f9c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java
@@ -1166,7 +1166,7 @@
       throws EvalException {
     if (semantics.getBool(BuildLanguageOptions.INCOMPATIBLE_NEW_ACTIONS_API)) {
       throw Starlark.errorf(
-          "Use %s instead of %s. \n"
+          "Use %s instead of %s.\n"
               + "Use --incompatible_new_actions_api=false to temporarily disable this check.",
           newApi, oldApi);
     }
diff --git a/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java b/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java
index ca839aa..92da9bb 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java
@@ -41,7 +41,7 @@
       help =
           "A comma-separated set of target patterns (additive and subtractive). The query may be"
               + " performed in the universe defined by the transitive closure of the specified"
-              + " targets. This option is used for the query and cquery commands. \n"
+              + " targets. This option is used for the query and cquery commands.\n"
               + "For cquery, the input to this option is the targets all answers are built under"
               + " and so this option may affect configurations and transitions. If this option is"
               + " not specified, the top-level targets are assumed to be the targets parsed from"
@@ -94,7 +94,7 @@
               + " not be included in the dependency graph over which the query operates. An 'exec"
               + " configuration' dependency edge, such as the one from any 'proto_library' rule to"
               + " the Protocol Compiler, usually points to a tool executed during the build rather"
-              + " than a part of the same 'target' program. \n"
+              + " than a part of the same 'target' program.\n"
               + "Cquery: If disabled, filters out all configured targets which cross an"
               + " execution transition from the top-level target that discovered this configured"
               + " target. That means if the top-level target is in the target configuration, only"
diff --git a/src/main/starlark/builtins_bzl/common/cc/cc_common.bzl b/src/main/starlark/builtins_bzl/common/cc/cc_common.bzl
index 3c622fc..1b0ff96 100644
--- a/src/main/starlark/builtins_bzl/common/cc/cc_common.bzl
+++ b/src/main/starlark/builtins_bzl/common/cc/cc_common.bzl
@@ -33,7 +33,7 @@
     ("", "tools/build_defs/android"),
     ("", "third_party/bazel_rules/rules_android"),
     ("build_bazel_rules_android", ""),
-    ("", "third_party/bazel_rules/rules_rust/rust/private"),
+    ("", "rust/private"),
     ("rules_rust", "rust/private"),
 ]