Skip to content

Commit

Permalink
Auto merge of #808 - shandongbinzhou:master, r=compiler-errors
Browse files Browse the repository at this point in the history
chore: fix typo in comment
  • Loading branch information
bors committed Apr 5, 2024
2 parents 20a72e0 + bbca15c commit f0e4c86
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion chalk-integration/src/lowering/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ impl Env<'_> {
I: IntoIterator<Item = chalk_ir::WithKind<ChalkIr, Ident>>,
I::IntoIter: ExactSizeIterator,
{
// As binders to introduce we recieve `ParameterKind<Ident>`,
// As binders to introduce we receive `ParameterKind<Ident>`,
// which we need to transform into `(Ident, ParameterKind<BoundVar>)`,
// because that is the key-value pair for ParameterMap.
// `swap_inner` lets us do precisely that, replacing `Ident` inside
Expand Down
2 changes: 1 addition & 1 deletion chalk-recursive/src/fixed_point/stack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ impl Stack {
};

if depth.depth >= self.overflow_depth {
// This shoudl perhaps be a result or something, though
// This should perhaps be a result or something, though
// really I'd prefer to move to subgoal abstraction for
// guaranteeing termination. -nmatsakis
panic!("overflow depth reached")
Expand Down
2 changes: 1 addition & 1 deletion chalk-solve/src/clauses/builtin_traits/clone.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ pub fn add_clone_program_clauses<I: Interner>(
ty: TyKind<I>,
binders: &CanonicalVarKinds<I>,
) -> Result<(), Floundered> {
// Implement Clone for types that automaticly implement Copy
// Implement Clone for types that automatically implement Copy
add_copy_program_clauses(db, builder, trait_ref, ty, binders)
}
2 changes: 1 addition & 1 deletion chalk-solve/src/rust_ir.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ impl AdtSizeAlign {
}

#[derive(Clone, Debug, PartialEq, Eq, Hash)]
/// A rust intermediate represention (rust_ir) of a function definition/declaration.
/// A rust intermediate representation (rust_ir) of a function definition/declaration.
/// For example, in the following rust code:
///
/// ```ignore
Expand Down
4 changes: 2 additions & 2 deletions tests/test/functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ fn function_implement_fn_traits() {
expect![["No possible solution"]]
}

// Function pointres implicity return `()` when no return
// Function pointers implicit return `()` when no return
// type is specified - make sure that normalization understands
// this
goal {
Expand Down Expand Up @@ -205,7 +205,7 @@ fn function_implement_fn_traits() {
expect![["Unique"]]
}

// Similiar to the above test, but for types instead of lifetimes:
// Similar to the above test, but for types instead of lifetimes:
// a 'stricter' function (requires types to be the same) can never
// implement `FnOnce` for a 'less strict' signature (does not require
// types to be the same)
Expand Down

0 comments on commit f0e4c86

Please sign in to comment.