Skip to content

Commit

Permalink
Merge #9984
Browse files Browse the repository at this point in the history
9984: Fix typos “a”→“an” r=Veykril a=steffahn

See rust-lang/rust#88230

Co-authored-by: Frank Steffahn <frank.steffahn@stu.uni-kiel.de>
  • Loading branch information
bors[bot] and steffahn authored Aug 22, 2021
2 parents b9d8798 + 3a5a935 commit c6baf3d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions crates/hir/src/semantics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
self.imp.ancestors_at_offset_with_macros(node, offset)
}

/// Find a AstNode by offset inside SyntaxNode, if it is inside *Macrofile*,
/// Find an AstNode by offset inside SyntaxNode, if it is inside *Macrofile*,
/// search up until it is of the target AstNode type
pub fn find_node_at_offset_with_macros<N: AstNode>(
&self,
Expand All @@ -213,7 +213,7 @@ impl<'db, DB: HirDatabase> Semantics<'db, DB> {
self.imp.ancestors_at_offset_with_macros(node, offset).find_map(N::cast)
}

/// Find a AstNode by offset inside SyntaxNode, if it is inside *MacroCall*,
/// Find an AstNode by offset inside SyntaxNode, if it is inside *MacroCall*,
/// descend it and find again
pub fn find_node_at_offset_with_descend<N: AstNode>(
&self,
Expand Down
2 changes: 1 addition & 1 deletion crates/hir_ty/src/diagnostics/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ impl ExprValidator {
for arm in arms {
if let Some(pat_ty) = infer.type_of_pat.get(arm.pat) {
// We only include patterns whose type matches the type
// of the match expression. If we had a InvalidMatchArmPattern
// of the match expression. If we had an InvalidMatchArmPattern
// diagnostic or similar we could raise that in an else
// block here.
//
Expand Down
2 changes: 1 addition & 1 deletion crates/ide_completion/src/completions/trait_impl.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Completion for associated items in a trait implementation.
//!
//! This module adds the completion items related to implementing associated
//! items within a `impl Trait for Struct` block. The current context node
//! items within an `impl Trait for Struct` block. The current context node
//! must be within either a `FN`, `TYPE_ALIAS`, or `CONST` node
//! and an direct child of an `IMPL`.
//!
Expand Down
2 changes: 1 addition & 1 deletion crates/paths/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ impl AbsPathBuf {
.unwrap_or_else(|path| panic!("expected absolute path, got {}", path.display()))
}

/// Coerces to a `AbsPath` slice.
/// Coerces to an `AbsPath` slice.
///
/// Equivalent of [`PathBuf::as_path`] for `AbsPathBuf`.
pub fn as_path(&self) -> &AbsPath {
Expand Down

0 comments on commit c6baf3d

Please sign in to comment.