From 26eb2bef2591ddb4cdf45d256cdcfa7c7353b0fc Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Thu, 5 May 2016 21:11:41 +0200 Subject: [PATCH] Fix some some duplicate words. --- src/bootstrap/build/job.rs | 2 +- src/librustc/session/config.rs | 2 +- src/librustc/traits/project.rs | 2 +- src/librustc/ty/trait_def.rs | 2 +- src/librustc/ty/wf.rs | 2 +- src/librustc_trans/intrinsic.rs | 2 +- src/libstd/net/ip.rs | 2 +- src/libstd/sys/unix/process.rs | 2 +- src/test/codegen-units/item-collection/cross-crate-closures.rs | 2 +- src/test/run-pass/regions-lub-ref-ref-rc.rs | 2 +- src/tools/linkchecker/main.rs | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/bootstrap/build/job.rs b/src/bootstrap/build/job.rs index a4e53bc45fcfb..4558e6f049432 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::(); info.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE; diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs index b8dd750d3f1c2..1a2c1b9a09528 100644 --- a/src/librustc/session/config.rs +++ b/src/librustc/session/config.rs @@ -1355,7 +1355,7 @@ pub mod nightly_options { early_error(ErrorOutputType::default(), &msg); } OptionStability::UnstableButNotReally => { - let msg = format!("the option `{}` is is unstable and should \ + let msg = format!("the option `{}` is unstable and should \ only be used on the nightly compiler, but \ it is currently accepted for backwards \ compatibility; this will soon change, \ diff --git a/src/librustc/traits/project.rs b/src/librustc/traits/project.rs index a0d6f5f912b2c..7fb13f49cb4a5 100644 --- a/src/librustc/traits/project.rs +++ b/src/librustc/traits/project.rs @@ -40,7 +40,7 @@ use std::rc::Rc; pub enum ProjectionMode { /// FIXME (#32205) /// At coherence-checking time, we're still constructing the - /// specialization graph, and thus we only project project + /// specialization graph, and thus we only project /// non-`default` associated types that are defined directly in /// the applicable impl. (This behavior should be improved over /// time, to allow for successful projections modulo cycles diff --git a/src/librustc/ty/trait_def.rs b/src/librustc/ty/trait_def.rs index faae95e711699..f194afaa81762 100644 --- a/src/librustc/ty/trait_def.rs +++ b/src/librustc/ty/trait_def.rs @@ -176,7 +176,7 @@ impl<'tcx> TraitDef<'tcx> { /// Records a trait-to-implementation mapping for a non-local impl. /// /// The `parent_impl` is the immediately-less-specialized impl, or the - /// trait's def ID if the impl is is not a specialization -- information that + /// trait's def ID if the impl is not a specialization -- information that /// should be pulled from the metadata. pub fn record_remote_impl(&self, tcx: &TyCtxt<'tcx>, diff --git a/src/librustc/ty/wf.rs b/src/librustc/ty/wf.rs index f93332e07737d..7de83ef5cc920 100644 --- a/src/librustc/ty/wf.rs +++ b/src/librustc/ty/wf.rs @@ -268,7 +268,7 @@ impl<'a,'tcx> WfPredicates<'a,'tcx> { /// into `self.out`. fn compute_projection(&mut self, data: ty::ProjectionTy<'tcx>) { // A projection is well-formed if (a) the trait ref itself is - // WF WF and (b) the trait-ref holds. (It may also be + // WF and (b) the trait-ref holds. (It may also be // normalizable and be WF that way.) self.compute_trait_ref(&data.trait_ref); diff --git a/src/librustc_trans/intrinsic.rs b/src/librustc_trans/intrinsic.rs index 1220fbafa29c9..7c5ce371ee919 100644 --- a/src/librustc_trans/intrinsic.rs +++ b/src/librustc_trans/intrinsic.rs @@ -1327,7 +1327,7 @@ fn generate_filter_fn<'a, 'tcx>(fcx: &FunctionContext<'a, 'tcx>, // %ret = call i32 @the_real_filter_function(%ehptrs, %arg) // ret i32 %ret // - // The recoverfp intrinsic is used to recover the frame frame pointer of the + // The recoverfp intrinsic is used to recover the frame pointer of the // `rust_try_fn` function, which is then in turn passed to the // `localrecover` intrinsic (pairing with the `localescape` intrinsic // mentioned above). Putting all this together means that we now have a diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs index adceee6d73ec5..019241982502e 100644 --- a/src/libstd/net/ip.rs +++ b/src/libstd/net/ip.rs @@ -371,7 +371,7 @@ impl Ipv6Addr { } /// Returns true if this is an address reserved for documentation - /// This is defined to be 2001:db8::/32 in RFC RFC 3849 + /// This is defined to be 2001:db8::/32 in RFC 3849. pub fn is_documentation(&self) -> bool { (self.segments()[0] == 0x2001) && (self.segments()[1] == 0xdb8) } diff --git a/src/libstd/sys/unix/process.rs b/src/libstd/sys/unix/process.rs index 270c2096b2c3b..0500480add22f 100644 --- a/src/libstd/sys/unix/process.rs +++ b/src/libstd/sys/unix/process.rs @@ -147,7 +147,7 @@ impl Command { let new_key = pair_to_key(key, val, &mut self.saw_nul); let (map, envp) = self.init_env_map(); - // If `key` is already present then we we just update `envp` in place + // If `key` is already present then we just update `envp` in place // (and store the owned value), but if it's not there we override the // trailing NULL pointer, add a new NULL pointer, and store where we // were located. diff --git a/src/test/codegen-units/item-collection/cross-crate-closures.rs b/src/test/codegen-units/item-collection/cross-crate-closures.rs index 30f3ef12d0743..546bb235a5f50 100644 --- a/src/test/codegen-units/item-collection/cross-crate-closures.rs +++ b/src/test/codegen-units/item-collection/cross-crate-closures.rs @@ -27,7 +27,7 @@ fn main() { //~ TRANS_ITEM fn cgu_extern_closures::inlined_fn_generic[0]::{{closure}}[0] let _ = cgu_extern_closures::inlined_fn_generic(3, 4, 5i32); - // Nothing should be generated for this call, we just link to the instance instance + // Nothing should be generated for this call, we just link to the instance // in the extern crate. let _ = cgu_extern_closures::non_inlined_fn(6, 7); } diff --git a/src/test/run-pass/regions-lub-ref-ref-rc.rs b/src/test/run-pass/regions-lub-ref-ref-rc.rs index 41c64197acbe8..ade742863a9da 100644 --- a/src/test/run-pass/regions-lub-ref-ref-rc.rs +++ b/src/test/run-pass/regions-lub-ref-ref-rc.rs @@ -9,7 +9,7 @@ // except according to those terms. // Test a corner case of LUB coercion. In this case, one arm of the -// match requires a deref coercion and other other doesn't, and there +// match requires a deref coercion and the other doesn't, and there // is an extra `&` on the `rc`. We want to be sure that the lifetime // assigned to this `&rc` value is not `'a` but something smaller. In // other words, the type from `rc` is `&'a Rc` and the type diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs index 12419d4f7e5f7..a7c8c01fab850 100644 --- a/src/tools/linkchecker/main.rs +++ b/src/tools/linkchecker/main.rs @@ -110,7 +110,7 @@ fn walk(cache: &mut Cache, if let Some(pretty_path) = pretty_path { let entry = cache.get_mut(&pretty_path).unwrap(); // we don't need the source anymore, - // so drop to to reduce memory-usage + // so drop to reduce memory-usage entry.source = String::new(); } }