Skip to content

Commit d6ffc42

Browse files
committed
Rollup merge of #33438 - birkenfeld:dup-words, r=steveklabnik
Fix some some duplicate words.
2 parents 782854a + 26eb2be commit d6ffc42

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed

src/bootstrap/build/job.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ pub unsafe fn setup() {
5454

5555
// Indicate that when all handles to the job object are gone that all
5656
// process in the object should be killed. Note that this includes our
57-
// entire process tree by default because we've added ourselves and and our
57+
// entire process tree by default because we've added ourselves and our
5858
// children will reside in the job by default.
5959
let mut info = mem::zeroed::<JOBOBJECT_EXTENDED_LIMIT_INFORMATION>();
6060
info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;

src/librustc/session/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1355,7 +1355,7 @@ pub mod nightly_options {
13551355
early_error(ErrorOutputType::default(), &msg);
13561356
}
13571357
OptionStability::UnstableButNotReally => {
1358-
let msg = format!("the option `{}` is is unstable and should \
1358+
let msg = format!("the option `{}` is unstable and should \
13591359
only be used on the nightly compiler, but \
13601360
it is currently accepted for backwards \
13611361
compatibility; this will soon change, \

src/librustc/traits/project.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ use std::rc::Rc;
4040
pub enum ProjectionMode {
4141
/// FIXME (#32205)
4242
/// At coherence-checking time, we're still constructing the
43-
/// specialization graph, and thus we only project project
43+
/// specialization graph, and thus we only project
4444
/// non-`default` associated types that are defined directly in
4545
/// the applicable impl. (This behavior should be improved over
4646
/// time, to allow for successful projections modulo cycles

src/librustc/ty/trait_def.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ impl<'tcx> TraitDef<'tcx> {
176176
/// Records a trait-to-implementation mapping for a non-local impl.
177177
///
178178
/// The `parent_impl` is the immediately-less-specialized impl, or the
179-
/// trait's def ID if the impl is is not a specialization -- information that
179+
/// trait's def ID if the impl is not a specialization -- information that
180180
/// should be pulled from the metadata.
181181
pub fn record_remote_impl(&self,
182182
tcx: &TyCtxt<'tcx>,

src/librustc/ty/wf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ impl<'a,'tcx> WfPredicates<'a,'tcx> {
268268
/// into `self.out`.
269269
fn compute_projection(&mut self, data: ty::ProjectionTy<'tcx>) {
270270
// A projection is well-formed if (a) the trait ref itself is
271-
// WF WF and (b) the trait-ref holds. (It may also be
271+
// WF and (b) the trait-ref holds. (It may also be
272272
// normalizable and be WF that way.)
273273

274274
self.compute_trait_ref(&data.trait_ref);

src/librustc_trans/intrinsic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1327,7 +1327,7 @@ fn generate_filter_fn<'a, 'tcx>(fcx: &FunctionContext<'a, 'tcx>,
13271327
// %ret = call i32 @the_real_filter_function(%ehptrs, %arg)
13281328
// ret i32 %ret
13291329
//
1330-
// The recoverfp intrinsic is used to recover the frame frame pointer of the
1330+
// The recoverfp intrinsic is used to recover the frame pointer of the
13311331
// `rust_try_fn` function, which is then in turn passed to the
13321332
// `localrecover` intrinsic (pairing with the `localescape` intrinsic
13331333
// mentioned above). Putting all this together means that we now have a

src/libstd/net/ip.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ impl Ipv6Addr {
371371
}
372372

373373
/// Returns true if this is an address reserved for documentation
374-
/// This is defined to be 2001:db8::/32 in RFC RFC 3849
374+
/// This is defined to be 2001:db8::/32 in RFC 3849.
375375
pub fn is_documentation(&self) -> bool {
376376
(self.segments()[0] == 0x2001) && (self.segments()[1] == 0xdb8)
377377
}

src/libstd/sys/unix/process.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ impl Command {
147147
let new_key = pair_to_key(key, val, &mut self.saw_nul);
148148
let (map, envp) = self.init_env_map();
149149

150-
// If `key` is already present then we we just update `envp` in place
150+
// If `key` is already present then we just update `envp` in place
151151
// (and store the owned value), but if it's not there we override the
152152
// trailing NULL pointer, add a new NULL pointer, and store where we
153153
// were located.

src/test/codegen-units/item-collection/cross-crate-closures.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ fn main() {
2727
//~ TRANS_ITEM fn cgu_extern_closures::inlined_fn_generic[0]::{{closure}}[0]<i32>
2828
let _ = cgu_extern_closures::inlined_fn_generic(3, 4, 5i32);
2929

30-
// Nothing should be generated for this call, we just link to the instance instance
30+
// Nothing should be generated for this call, we just link to the instance
3131
// in the extern crate.
3232
let _ = cgu_extern_closures::non_inlined_fn(6, 7);
3333
}

src/test/run-pass/regions-lub-ref-ref-rc.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// Test a corner case of LUB coercion. In this case, one arm of the
12-
// match requires a deref coercion and other other doesn't, and there
12+
// match requires a deref coercion and the other doesn't, and there
1313
// is an extra `&` on the `rc`. We want to be sure that the lifetime
1414
// assigned to this `&rc` value is not `'a` but something smaller. In
1515
// other words, the type from `rc` is `&'a Rc<String>` and the type

src/tools/linkchecker/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ fn walk(cache: &mut Cache,
110110
if let Some(pretty_path) = pretty_path {
111111
let entry = cache.get_mut(&pretty_path).unwrap();
112112
// we don't need the source anymore,
113-
// so drop to to reduce memory-usage
113+
// so drop to reduce memory-usage
114114
entry.source = String::new();
115115
}
116116
}

0 commit comments

Comments
 (0)