From 8227db86eb8c9497ba81da35c012f23ece7a1ac0 Mon Sep 17 00:00:00 2001 From: Tshepang Lekhonkhobe Date: Wed, 6 May 2015 01:49:07 +0200 Subject: [PATCH] fix typos caught by codespell --- src/librustc/middle/resolve_lifetime.rs | 6 +++--- src/librustc_typeck/astconv.rs | 2 +- src/librustdoc/clean/mod.rs | 2 +- src/libstd/sys/unix/process2.rs | 2 +- src/rt/valgrind/valgrind.h | 2 +- src/test/run-pass/issue-20616.rs | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/librustc/middle/resolve_lifetime.rs b/src/librustc/middle/resolve_lifetime.rs index 6f40e17855a78..e7a03a9b7e174 100644 --- a/src/librustc/middle/resolve_lifetime.rs +++ b/src/librustc/middle/resolve_lifetime.rs @@ -374,7 +374,7 @@ fn extract_labels<'v, 'a>(ctxt: &mut LifetimeContext<'a>, b: &'v ast::Block) { fn visit_expr(&mut self, ex: &'v ast::Expr) { if let Some(label) = expression_label(ex) { for &(prior, prior_span) in &self.labels_in_fn[..] { - // FIXME (#24278): non-hygienic comparision + // FIXME (#24278): non-hygienic comparison if label.name == prior.name { signal_shadowing_problem(self.sess, label.name, @@ -420,7 +420,7 @@ fn extract_labels<'v, 'a>(ctxt: &mut LifetimeContext<'a>, b: &'v ast::Block) { EarlyScope(_, lifetimes, s) | LateScope(lifetimes, s) => { for lifetime_def in lifetimes { - // FIXME (#24278): non-hygienic comparision + // FIXME (#24278): non-hygienic comparison if label.name == lifetime_def.lifetime.name { signal_shadowing_problem( sess, @@ -677,7 +677,7 @@ impl<'a> LifetimeContext<'a> { lifetime: &ast::Lifetime) { for &(label, label_span) in &self.labels_in_fn { - // FIXME (#24278): non-hygienic comparision + // FIXME (#24278): non-hygienic comparison if lifetime.name == label.name { signal_shadowing_problem(self.sess, lifetime.name, diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs index 694993cdc0aae..677254238c034 100644 --- a/src/librustc_typeck/astconv.rs +++ b/src/librustc_typeck/astconv.rs @@ -1344,7 +1344,7 @@ pub fn ast_ty_arg_to_ty<'tcx>(this: &AstConv<'tcx>, } // Check the base def in a PathResolution and convert it to a Ty. If there are -// associated types in the PathResolution, these will need to be seperately +// associated types in the PathResolution, these will need to be separately // resolved. fn base_def_to_ty<'tcx>(this: &AstConv<'tcx>, rscope: &RegionScope, diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 1e6e9a7562a7c..444e5dea89a46 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -944,7 +944,7 @@ impl<'a, 'tcx> Clean for (&'a ty::Generics<'tcx>, // a Sized bound, removing the bounds as we find them. // // Note that associated types also have a sized bound by default, but we - // don't actually konw the set of associated types right here so that's + // don't actually know the set of associated types right here so that's // handled in cleaning associated types let mut sized_params = HashSet::new(); where_predicates.retain(|pred| { diff --git a/src/libstd/sys/unix/process2.rs b/src/libstd/sys/unix/process2.rs index 4e7c4d241f532..6f3c0fd63aa6d 100644 --- a/src/libstd/sys/unix/process2.rs +++ b/src/libstd/sys/unix/process2.rs @@ -328,7 +328,7 @@ impl Process { }) { Ok(0) => None, Ok(n) if n == self.pid => Some(translate_status(status)), - Ok(n) => panic!("unkown pid: {}", n), + Ok(n) => panic!("unknown pid: {}", n), Err(e) => panic!("unknown waitpid error: {}", e), } } diff --git a/src/rt/valgrind/valgrind.h b/src/rt/valgrind/valgrind.h index af01dfd71a71c..51f9de8edf057 100644 --- a/src/rt/valgrind/valgrind.h +++ b/src/rt/valgrind/valgrind.h @@ -5122,7 +5122,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...) /* These requests allow control to move from the simulated CPU to the - real CPU, calling an arbitary function. + real CPU, calling an arbitrary function. Note that the current ThreadId is inserted as the first argument. So this call: diff --git a/src/test/run-pass/issue-20616.rs b/src/test/run-pass/issue-20616.rs index e6b256f7e8413..d5b799710941b 100644 --- a/src/test/run-pass/issue-20616.rs +++ b/src/test/run-pass/issue-20616.rs @@ -32,7 +32,7 @@ type TypeF = Box; // type argument with trailing comma type TypeG = Box; -// trailing comma on liftime defs +// trailing comma on lifetime defs type TypeH<'a,> = &'a (); // trailing comma on type argument