Skip to content

fix typos caught by codespell #25138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 7, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/librustc/middle/resolve_lifetime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_typeck/astconv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/clean/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@ impl<'a, 'tcx> Clean<Generics> 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| {
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/sys/unix/process2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/rt/valgrind/valgrind.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/issue-20616.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type TypeF<T> = Box<T>;
// type argument with trailing comma
type TypeG<T> = Box<T,>;

// trailing comma on liftime defs
// trailing comma on lifetime defs
type TypeH<'a,> = &'a ();

// trailing comma on type argument
Expand Down