Fix "the the".
Closes #7804.
PiperOrigin-RevId: 239819422
diff --git a/scripts/bazel-complete-template.bash b/scripts/bazel-complete-template.bash
index 7b62ec4..2f182f0 100644
--- a/scripts/bazel-complete-template.bash
+++ b/scripts/bazel-complete-template.bash
@@ -46,7 +46,7 @@
# Pattern to match for looking for a target
# BAZEL_BUILD_MATCH_PATTERN__* give the pattern for label-*
-# when looking in the the build file.
+# when looking in the build file.
# BAZEL_QUERY_MATCH_PATTERN__* give the pattern for label-*
# when using 'bazel query'.
# _RUNTEST is a special case for _bazel_completion_allow_tests_for_run.
diff --git a/site/jekyll-tree.sh b/site/jekyll-tree.sh
index 935a4d4..0f9d383 100755
--- a/site/jekyll-tree.sh
+++ b/site/jekyll-tree.sh
@@ -67,7 +67,7 @@
unzip -qq "$SL_ZIP" -d "$sl_dir"
mv "$sl_dir/skylark-nav.html" "$OUT_DIR/_includes"
- # Unpack the the documentation for the repository rules to repo subdirectory
+ # Unpack the documentation for the repository rules to repo subdirectory
local repo_dir="${VERSION_DIR}/repo"
mkdir -p "${repo_dir}"
tar -C "${repo_dir}" -xf "${REPO_TAR}"
diff --git a/src/java_tools/junitrunner/java/com/google/testing/coverage/BranchExp.java b/src/java_tools/junitrunner/java/com/google/testing/coverage/BranchExp.java
index f6b1f9b..2ee04e6 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/coverage/BranchExp.java
+++ b/src/java_tools/junitrunner/java/com/google/testing/coverage/BranchExp.java
@@ -57,7 +57,7 @@
branches.set(idx, exp);
}
- /** Make a union of the the branches of two BranchExp. */
+ /** Make a union of the branches of two BranchExp. */
public void merge(BranchExp other) {
branches.addAll(other.branches);
}
diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventContext.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventContext.java
index 62aa48b..b032b0d 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventContext.java
+++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/BuildEventContext.java
@@ -20,8 +20,8 @@
*/
public interface BuildEventContext {
/**
- * Return the {@link PathConverter} to be used in order to obtain URIs for the the file paths to
- * be reported in the event.
+ * Return the {@link PathConverter} to be used in order to obtain URIs for the file paths to be
+ * reported in the event.
*/
PathConverter pathConverter();
diff --git a/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java b/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
index a9c367e..86476d3 100644
--- a/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
+++ b/src/main/java/com/google/devtools/build/lib/cmdline/TargetPattern.java
@@ -517,10 +517,10 @@
/**
* There's a potential ambiguity if '//foo/bar:all' refers to an actual target. In this case, we
- * use the the target but print a warning.
+ * use the target but print a warning.
*
* @return the Target corresponding to the given pattern, if the pattern is absolute and there
- * is such a target. Otherwise, return null.
+ * is such a target. Otherwise, return null.
*/
private <T> ResolvedTargets<T> getWildcardConflict(TargetPatternResolver<T> resolver)
throws InterruptedException {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/AdvertisedProviderSet.java b/src/main/java/com/google/devtools/build/lib/packages/AdvertisedProviderSet.java
index 9f99a01..b615086 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AdvertisedProviderSet.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AdvertisedProviderSet.java
@@ -20,18 +20,16 @@
import java.util.Objects;
/**
- * Captures the the set of providers rules and aspects can advertise.
- * It is either of:
+ * Captures the set of providers rules and aspects can advertise. It is either of:
+ *
* <ul>
- * <li>a set of native and skylark providers</li>
- * <li>"can have any provider" set that alias rules have.</li>
+ * <li>a set of native and skylark providers
+ * <li>"can have any provider" set that alias rules have.
* </ul>
*
- * <p>
- * Native providers should in theory only contain subclasses of
- * {@link com.google.devtools.build.lib.analysis.TransitiveInfoProvider}, but
- * our current dependency structure does not allow a reference to that class here.
- * </p>
+ * <p>Native providers should in theory only contain subclasses of {@link
+ * com.google.devtools.build.lib.analysis.TransitiveInfoProvider}, but our current dependency
+ * structure does not allow a reference to that class here.
*/
@Immutable
public final class AdvertisedProviderSet {
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadedPackage.java b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadedPackage.java
index 9f6b96e..c529aff 100644
--- a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadedPackage.java
+++ b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadedPackage.java
@@ -33,8 +33,8 @@
boolean isValid() throws InterruptedException;
/**
- * Returns true iff the the contents of the package are guaranteed not to have changed after
- * between {@link #isValid()} calls and syncs of the associated package loader.
+ * Returns true iff the contents of the package are guaranteed not to have changed after between
+ * {@link #isValid()} calls and syncs of the associated package loader.
*/
boolean contentsCouldNotHaveChanged();
diff --git a/src/main/java/com/google/devtools/build/lib/profiler/SingleStatRecorder.java b/src/main/java/com/google/devtools/build/lib/profiler/SingleStatRecorder.java
index b40ffba..568eeee 100644
--- a/src/main/java/com/google/devtools/build/lib/profiler/SingleStatRecorder.java
+++ b/src/main/java/com/google/devtools/build/lib/profiler/SingleStatRecorder.java
@@ -42,7 +42,7 @@
histogram = new int[buckets];
}
- /** Create an snapshot of the the stats recorded up to now. */
+ /** Create an snapshot of the stats recorded up to now. */
public MetricData snapshot() {
synchronized (this) {
ImmutableList.Builder<HistogramElement> result = ImmutableList.builder();
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalStateTracker.java b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalStateTracker.java
index 512eb69..ae075a9 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalStateTracker.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalStateTracker.java
@@ -661,12 +661,12 @@
}
/**
- * Maybe add a note about the last test that passed. Return true, if the note was added (and
- * hence a line break is appropriate if more data is to come. If a null value is provided for
- * the terminal writer, only return wether a note would be added.
+ * Maybe add a note about the last test that passed. Return true, if the note was added (and hence
+ * a line break is appropriate if more data is to come. If a null value is provided for the
+ * terminal writer, only return whether a note would be added.
*
- * The width parameter gives advice on to which length the the description of the test should
- * the shortened to, if possible.
+ * <p>The width parameter gives advice on to which length the description of the test should the
+ * shortened to, if possible.
*/
private boolean maybeShowRecentTest(
AnsiTerminalWriter terminalWriter, boolean shortVersion, int width) throws IOException {
diff --git a/src/main/java/com/google/devtools/build/lib/shell/Command.java b/src/main/java/com/google/devtools/build/lib/shell/Command.java
index 1584275..0c3636b 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/Command.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/Command.java
@@ -151,23 +151,24 @@
* Creates a new {@link Command} for the given command line elements. The command line is executed
* without a shell.
*
- * <p>The given environment variables and working directory are used in subsequent calls to
- * {@link #execute()}.
+ * <p>The given environment variables and working directory are used in subsequent calls to {@link
+ * #execute()}.
*
- * <p>This command treats the 0-th element of {@code commandLineElement} (the name of an
+ * <p>This command treats the 0-th element of {@code commandLineElement} (the name of an
* executable to run) specially.
+ *
* <ul>
- * <li>If it is an absolute path, it is used as it</li>
- * <li>If it is a single file name, the PATH lookup is performed</li>
- * <li>If it is a relative path that is not a single file name, the command will attempt to
- * execute the the binary at that path relative to {@code workingDirectory}.</li>
+ * <li>If it is an absolute path, it is used as it
+ * <li>If it is a single file name, the PATH lookup is performed
+ * <li>If it is a relative path that is not a single file name, the command will attempt to
+ * execute the binary at that path relative to {@code workingDirectory}.
* </ul>
*
* @param commandLineElements elements of raw command line to execute
* @param environmentVariables environment variables to replace JVM's environment variables; may
- * be null
+ * be null
* @param workingDirectory working directory for execution; if null, the VM's current working
- * directory is used
+ * directory is used
* @param timeout timeout; a value less than or equal to 0 is treated as no timeout
* @throws IllegalArgumentException if commandLine is null or empty
*/
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/BuildFileAST.java b/src/main/java/com/google/devtools/build/lib/syntax/BuildFileAST.java
index 20ac4b7..0da3c30 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/BuildFileAST.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/BuildFileAST.java
@@ -459,8 +459,8 @@
}
/**
- * Parses and validates the lines from input and return the the AST
- * In case of error during validation, it throws an EvalException.
+ * Parses and validates the lines from input and return the AST In case of error during
+ * validation, it throws an EvalException.
*/
public static BuildFileAST parseAndValidateSkylarkString(Environment env, String[] input)
throws EvalException {
diff --git a/src/main/java/com/google/devtools/build/lib/util/ShellEscaper.java b/src/main/java/com/google/devtools/build/lib/util/ShellEscaper.java
index 0548d5f..d54bbda 100644
--- a/src/main/java/com/google/devtools/build/lib/util/ShellEscaper.java
+++ b/src/main/java/com/google/devtools/build/lib/util/ShellEscaper.java
@@ -21,7 +21,6 @@
import com.google.common.escape.CharEscaperBuilder;
import com.google.common.escape.Escaper;
import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable;
-
import java.io.IOException;
/**
@@ -118,18 +117,15 @@
}
/**
- * Escapes all strings in {@code argv} individually and joins them on
- * single spaces into {@code out}. The result is appended directly into
- * {@code out}, without adding a separator.
+ * Escapes all strings in {@code argv} individually and joins them on single spaces into {@code
+ * out}. The result is appended directly into {@code out}, without adding a separator.
*
- * <p>This method works as if by invoking
- * {@link #escapeJoinAll(Appendable, Iterable, Joiner)} with
- * {@code Joiner.on(' ')}.
+ * <p>This method works as if by invoking {@link #escapeJoinAll(Appendable, Iterable, Joiner)}
+ * with {@code Joiner.on(' ')}.
*
* @param out what the result will be appended to
* @param argv the strings to escape and join
- * @return the same reference as {@code out}, now containing the the
- * joined, escaped fragments
+ * @return the same reference as {@code out}, now containing the joined, escaped fragments
* @throws IOException if an I/O error occurs while appending
*/
public static Appendable escapeJoinAll(Appendable out, Iterable<? extends String> argv)
@@ -138,27 +134,25 @@
}
/**
- * Escapes all strings in {@code argv} individually and joins them into
- * {@code out} using the specified {@link Joiner}. The result is appended
- * directly into {@code out}, without adding a separator.
+ * Escapes all strings in {@code argv} individually and joins them into {@code out} using the
+ * specified {@link Joiner}. The result is appended directly into {@code out}, without adding a
+ * separator.
*
- * <p>The resulting strings are the same as if escaped one by one using
- * {@link #escapeString(String)}.
+ * <p>The resulting strings are the same as if escaped one by one using {@link
+ * #escapeString(String)}.
*
- * <p>Example: if the joiner is {@code Joiner.on('|')}, then the input
- * {@code ["abc", "de'f"]} will be escaped as "{@code abc|'de'\''f'}".
- * If {@code out} initially contains "{@code 123}", then the returned
- * {@code Appendable} will contain "{@code 123abc|'de'\''f'}".
+ * <p>Example: if the joiner is {@code Joiner.on('|')}, then the input {@code ["abc", "de'f"]}
+ * will be escaped as "{@code abc|'de'\''f'}". If {@code out} initially contains "{@code 123}",
+ * then the returned {@code Appendable} will contain "{@code 123abc|'de'\''f'}".
*
* @param out what the result will be appended to
* @param argv the strings to escape and join
* @param joiner the {@link Joiner} to use to join the escaped strings
- * @return the same reference as {@code out}, now containing the the
- * joined, escaped fragments
+ * @return the same reference as {@code out}, now containing the joined, escaped fragments
* @throws IOException if an I/O error occurs while appending
*/
- public static Appendable escapeJoinAll(Appendable out, Iterable<? extends String> argv,
- Joiner joiner) throws IOException {
+ public static Appendable escapeJoinAll(
+ Appendable out, Iterable<? extends String> argv, Joiner joiner) throws IOException {
return joiner.appendTo(out, escapeAll(argv));
}
diff --git a/src/main/java/com/google/devtools/build/skyframe/CyclesReporter.java b/src/main/java/com/google/devtools/build/skyframe/CyclesReporter.java
index 301774d..68ff579 100644
--- a/src/main/java/com/google/devtools/build/skyframe/CyclesReporter.java
+++ b/src/main/java/com/google/devtools/build/skyframe/CyclesReporter.java
@@ -18,12 +18,12 @@
import com.google.devtools.build.lib.events.ExtendedEventHandler;
/**
- * An utility for custom reporting of errors from cycles in the the Skyframe graph. This class is
- * stateful in order to differentiate between new cycles and cycles that have already been
- * reported (do not reuse the instances or cache the results as it could end up printing
- * inconsistent information or leak memory). It treats two cycles as the same if they contain the
- * same {@link SkyKey}s in the same order, but perhaps with different starting points. See
- * {@link CycleDeduper} for more information.
+ * An utility for custom reporting of errors from cycles in the Skyframe graph. This class is
+ * stateful in order to differentiate between new cycles and cycles that have already been reported
+ * (do not reuse the instances or cache the results as it could end up printing inconsistent
+ * information or leak memory). It treats two cycles as the same if they contain the same {@link
+ * SkyKey}s in the same order, but perhaps with different starting points. See {@link CycleDeduper}
+ * for more information.
*/
public class CyclesReporter {
diff --git a/src/test/shell/integration/experimental_ui_test.sh b/src/test/shell/integration/experimental_ui_test.sh
index 60263a8..48067cf 100755
--- a/src/test/shell/integration/experimental_ui_test.sh
+++ b/src/test/shell/integration/experimental_ui_test.sh
@@ -480,7 +480,7 @@
function test_error_message_despite_output_limit {
# Verify that, even if we limit the output very strictly, we
- # still the the final error message.
+ # still the final error message.
bazel clean --expunge
bazel version
bazel build --experimental_ui --curses=yes --color=yes \
diff --git a/src/tools/android/java/com/google/devtools/build/android/ziputils/BufferedFile.java b/src/tools/android/java/com/google/devtools/build/android/ziputils/BufferedFile.java
index 41e5f30..879e695 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ziputils/BufferedFile.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ziputils/BufferedFile.java
@@ -93,27 +93,27 @@
}
/**
- * Returns a byte buffer for reading {@code len} bytes from the {@code off} position
- * in the file. If the requested bytes are already loaded in the internal buffer, a slice is
- * returned, with position 0 and limit set to {@code len}. The slice may have a capacity greater
- * than its limit, if more bytes are already available in the internal buffer. If the requested
- * bytes are not available, but can fit in the current internal buffer, then more data is read,
- * before a slice is created as described above. If the requested data falls outside the range
- * that can be fitted into the current internal buffer, then a new internal buffer is allocated.
- * The prior internal buffer (if any), is no longer referenced by this object (but it may still
- * be referenced by the client, holding references to byte buffers returned from prior call to
- * this method). The new internal buffer will be based at {@code off} file position, and have a
- * capacity equal to the maximum of the {@code blockSize} of this buffer and {@code len}, except
- * that it will never exceed the the number of bytes from {@code off} to the end of the readable
- * region of the file (min-max rule).
+ * Returns a byte buffer for reading {@code len} bytes from the {@code off} position in the file.
+ * If the requested bytes are already loaded in the internal buffer, a slice is returned, with
+ * position 0 and limit set to {@code len}. The slice may have a capacity greater than its limit,
+ * if more bytes are already available in the internal buffer. If the requested bytes are not
+ * available, but can fit in the current internal buffer, then more data is read, before a slice
+ * is created as described above. If the requested data falls outside the range that can be fitted
+ * into the current internal buffer, then a new internal buffer is allocated. The prior internal
+ * buffer (if any), is no longer referenced by this object (but it may still be referenced by the
+ * client, holding references to byte buffers returned from prior call to this method). The new
+ * internal buffer will be based at {@code off} file position, and have a capacity equal to the
+ * maximum of the {@code blockSize} of this buffer and {@code len}, except that it will never
+ * exceed the number of bytes from {@code off} to the end of the readable region of the file
+ * (min-max rule).
*
* @param off
* @param len
* @return a slice of the internal byte buffer containing the requested data. Except, if the
- * client request data beyond the readable region of the file, the {@code len} value is reduced
- * to the maximum number of bytes available from the given {@code off}.
+ * client request data beyond the readable region of the file, the {@code len} value is
+ * reduced to the maximum number of bytes available from the given {@code off}.
* @throws IllegalArgumentException if {@code len} is less than 0, or {@code off} is outside the
- * readable region specified when constructing this object.
+ * readable region specified when constructing this object.
* @throws IOException if thrown by the underlying file channel.
*/
public synchronized ByteBuffer getBuffer(long off, int len) throws IOException {
diff --git a/tools/build_defs/repo/java.bzl b/tools/build_defs/repo/java.bzl
index 873b1b1..46e8e43 100644
--- a/tools/build_defs/repo/java.bzl
+++ b/tools/build_defs/repo/java.bzl
@@ -64,7 +64,7 @@
is that com.initech.tps will contain classes like
com.initech.tps.shade.com.fakecorp.foo. This is less problematic, since it
won't lead to mysterious classpath conflicts. But it can lead to inefficient
-use of space and make the license of the the end product more difficult to
+use of space and make the license of the end product more difficult to
determine.
#### Licensing
