From e1d9b58608a6b7a35b59a598d495cb20df3f0eac Mon Sep 17 00:00:00 2001 From: hlopko Date: Mon, 23 Jul 2018 03:06:32 -0700 Subject: Remove gender specific prononuns from Bazel codebase RELNOTES: None. PiperOrigin-RevId: 205635805 --- site/docs/output_directories.md | 2 +- .../com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java | 2 +- .../google/devtools/build/lib/buildtool/LocalEnvironmentException.java | 2 +- .../java/com/google/devtools/build/lib/packages/StructProvider.java | 2 +- .../java/com/google/devtools/build/lib/rules/android/AndroidBinary.java | 2 +- .../java/com/google/devtools/build/lib/rules/android/AndroidSdk.java | 2 +- src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java | 2 +- src/main/java/com/google/devtools/build/lib/rules/java/JavaUtil.java | 2 +- .../com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java | 2 +- .../java/com/google/devtools/build/skyframe/ParallelEvaluatorTest.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/site/docs/output_directories.md b/site/docs/output_directories.md index 3af84db6ec..b8cbaff5dd 100644 --- a/site/docs/output_directories.md +++ b/site/docs/output_directories.md @@ -16,7 +16,7 @@ Requirements for an output directory layout: * Be easy to access. * Be easy to clean, even selectively. * Is unambiguous, even if the user relies on symbolic links when changing into - his/her client directory. + their client directory. * All the build state per user should be underneath one directory ("I'd like to clean all the .o files from all my clients.") diff --git a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java index 7730719fe1..853ecb93a8 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/TopLevelArtifactHelper.java @@ -67,7 +67,7 @@ public final class TopLevelArtifactHelper { * The set of artifacts to build. * *

There are two kinds: the ones that the user cares about (e.g. files to build) and the ones - * she doesn't (e.g. baseline coverage artifacts). The latter type doesn't get reported on various + * they don't (e.g. baseline coverage artifacts). The latter type doesn't get reported on various * outputs, e.g. on the console output listing the output artifacts of targets on the command * line. */ diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/LocalEnvironmentException.java b/src/main/java/com/google/devtools/build/lib/buildtool/LocalEnvironmentException.java index 3a53c1eb1c..b310ea99a3 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/LocalEnvironmentException.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/LocalEnvironmentException.java @@ -19,7 +19,7 @@ import com.google.devtools.build.lib.util.ExitCode; /** * An exception that signals that something is wrong with the user's environment - * that he can fix. Used to report the problem of having no free space left in + * that they can fix. Used to report the problem of having no free space left in * the blaze output directory. * *

Note that this is a much higher level exception then the similarly named diff --git a/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java b/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java index 4396b43a15..7ac0d3a529 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java +++ b/src/main/java/com/google/devtools/build/lib/packages/StructProvider.java @@ -49,7 +49,7 @@ public final class StructProvider extends BuiltinProvider } /** - * Creates a struct with the he given field values and message format for unknown fields. + * Creates a struct with the given field values and message format for unknown fields. * *

The custom message is useful for objects that have fields but aren't exactly used as * providers, such as the {@code native} object, and the struct fields of {@code ctx} like diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java index 7af49f7d76..a413f0c280 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java @@ -1836,7 +1836,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { /** * List of Android SDKs that contain runtimes that do not support the native multidexing * introduced in Android L. If someone tries to build an android_binary that has multidex=native - * set with an old SDK, we will exit with an error to alert the developer that his application + * set with an old SDK, we will exit with an error to alert the developer that their application * might not run on devices that the used SDK still supports. */ private static final ImmutableSet RUNTIMES_THAT_DONT_SUPPORT_NATIVE_MULTIDEXING = diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java index 768e81ac97..f58a1088e9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java @@ -35,7 +35,7 @@ public class AndroidSdk implements RuleConfiguredTargetFactory { public ConfiguredTarget create(RuleContext ruleContext) throws InterruptedException, RuleErrorException, ActionConflictException { // If the user didn't specify --proguard_top, go with the proguard attribute in the android_sdk - // rule. Otherwise, use what she told us to. + // rule. Otherwise, use what they told us to. FilesToRunProvider proguard = ruleContext.getFragment(JavaConfiguration.class).getProguardBinary() == null ? ruleContext.getExecutablePrerequisite("proguard", Mode.HOST) diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java index 69678c2a39..4255336b25 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaHelper.java @@ -98,7 +98,7 @@ public abstract class JavaHelper { ShellUtils.tokenize(result, current); } catch (ShellUtils.TokenizationException ex) { // Tokenization failed; this likely means that the user - // did not want tokenization to happen on his argument. + // did not want tokenization to happen on their argument. // (Any tokenization where we should produce an error // has already been done by the shell that invoked // blaze). Therefore, pass the argument through to diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaUtil.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaUtil.java index ee0134206e..7f49a9e277 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaUtil.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaUtil.java @@ -32,7 +32,7 @@ public final class JavaUtil { * * This way of figuring out Java source roots is basically * broken. I think we need to support these two use cases: - * (1) A user puts his / her shell into a directory named java. + * (1) A user puts their shell into a directory named java. * (2) Someplace in the tree, there's a package named java. * * (1) is more important than (2); and (2) cannot always be guaranteed diff --git a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java index 1bf0e008b7..0bcba87630 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java @@ -111,7 +111,7 @@ public class ExperimentalEventHandler implements EventHandler { * steps. *