about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2016-05-07 15:35:19 -0400
committerSteve Klabnik <steve@steveklabnik.com>2016-05-07 15:35:19 -0400
commitaa63f54e3752382f59cc68aba8dae0c0d7bdda5a (patch)
treefdc974713887db2abee0347b0971e66ed1a9ed52 /src/bootstrap
parent1ce94053800c192f2d9c7126dc26297cbbfc73ff (diff)
parent26eb2bef2591ddb4cdf45d256cdcfa7c7353b0fc (diff)
Rollup merge of #33438 - birkenfeld:dup-words, r=steveklabnik
Fix some some duplicate words.
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/build/job.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/build/job.rs b/src/bootstrap/build/job.rs
index a4e53bc45fc..4558e6f0494 100644
--- a/src/bootstrap/build/job.rs
+++ b/src/bootstrap/build/job.rs
@@ -54,7 +54,7 @@ pub unsafe fn setup() {
 
     // Indicate that when all handles to the job object are gone that all
     // process in the object should be killed. Note that this includes our
-    // entire process tree by default because we've added ourselves and and our
+    // entire process tree by default because we've added ourselves and our
     // children will reside in the job by default.
     let mut info = mem::zeroed::<JOBOBJECT_EXTENDED_LIMIT_INFORMATION>();
     info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;