diff options
9 files changed, 16 insertions, 11 deletions
diff --git a/src/tools/rust-analyzer/.github/workflows/ci.yaml b/src/tools/rust-analyzer/.github/workflows/ci.yaml index d82e46016dc..46bae20054c 100644 --- a/src/tools/rust-analyzer/.github/workflows/ci.yaml +++ b/src/tools/rust-analyzer/.github/workflows/ci.yaml @@ -220,7 +220,7 @@ jobs: timeout-minutes: 10 env: FORCE_COLOR: 1 - TYPOS_VERSION: v1.18.0 + TYPOS_VERSION: v1.28.3 steps: - name: download typos run: curl -LsSf https://github.com/crate-ci/typos/releases/download/$TYPOS_VERSION/typos-$TYPOS_VERSION-x86_64-unknown-linux-musl.tar.gz | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin diff --git a/src/tools/rust-analyzer/.typos.toml b/src/tools/rust-analyzer/.typos.toml index febfb233bd9..0f2f9b1b275 100644 --- a/src/tools/rust-analyzer/.typos.toml +++ b/src/tools/rust-analyzer/.typos.toml @@ -16,7 +16,8 @@ extend-ignore-re = [ "raison d'être", "inout", "INOUT", - "optin" + "optin", + "=Pn", ] [default.extend-words] @@ -26,8 +27,12 @@ fo = "fo" ket = "ket" makro = "makro" trivias = "trivias" +thir = "thir" +jod = "jod" [default.extend-identifiers] +anc = "anc" datas = "datas" impl_froms = "impl_froms" selfs = "selfs" +taits = "taits" diff --git a/src/tools/rust-analyzer/crates/hir-ty/src/tests/traits.rs b/src/tools/rust-analyzer/crates/hir-ty/src/tests/traits.rs index e15d44bd6de..dda7bfb2baf 100644 --- a/src/tools/rust-analyzer/crates/hir-ty/src/tests/traits.rs +++ b/src/tools/rust-analyzer/crates/hir-ty/src/tests/traits.rs @@ -4380,7 +4380,7 @@ fn test() { fn associated_type_in_struct_expr_path() { // FIXME: All annotation should be resolvable. // For lines marked as unstable, see rust-lang/rust#86935. - // FIXME: Remove the comments once stablized. + // FIXME: Remove the comments once stabilized. check_types( r#" trait Trait { @@ -4416,7 +4416,7 @@ impl Trait for () { fn associated_type_in_struct_expr_path_enum() { // FIXME: All annotation should be resolvable. // For lines marked as unstable, see rust-lang/rust#86935. - // FIXME: Remove the comments once stablized. + // FIXME: Remove the comments once stabilized. check_types( r#" trait Trait { diff --git a/src/tools/rust-analyzer/crates/ide-assists/src/handlers/extract_function.rs b/src/tools/rust-analyzer/crates/ide-assists/src/handlers/extract_function.rs index 2e363b0b62c..438769a0a87 100644 --- a/src/tools/rust-analyzer/crates/ide-assists/src/handlers/extract_function.rs +++ b/src/tools/rust-analyzer/crates/ide-assists/src/handlers/extract_function.rs @@ -5011,7 +5011,7 @@ fn $0fun_name(bar: &str) { } #[test] - fn unresolveable_types_default_to_placeholder() { + fn unresolvable_types_default_to_placeholder() { check_assist( extract_function, r#" diff --git a/src/tools/rust-analyzer/crates/ide-assists/src/handlers/generate_function.rs b/src/tools/rust-analyzer/crates/ide-assists/src/handlers/generate_function.rs index 76a647807cb..7b95c124e62 100644 --- a/src/tools/rust-analyzer/crates/ide-assists/src/handlers/generate_function.rs +++ b/src/tools/rust-analyzer/crates/ide-assists/src/handlers/generate_function.rs @@ -2055,7 +2055,7 @@ fn bar(closure: impl Fn(i64) -> i64) { } #[test] - fn unresolveable_types_default_to_placeholder() { + fn unresolvable_types_default_to_placeholder() { check_assist( generate_function, r" diff --git a/src/tools/rust-analyzer/crates/ide-assists/src/handlers/move_guard.rs b/src/tools/rust-analyzer/crates/ide-assists/src/handlers/move_guard.rs index ec3281619cc..f0c96fe3cb8 100644 --- a/src/tools/rust-analyzer/crates/ide-assists/src/handlers/move_guard.rs +++ b/src/tools/rust-analyzer/crates/ide-assists/src/handlers/move_guard.rs @@ -36,7 +36,7 @@ pub(crate) fn move_guard_to_arm_body(acc: &mut Assists, ctx: &AssistContext<'_>) let match_arm = ctx.find_node_at_offset::<MatchArm>()?; let guard = match_arm.guard()?; if ctx.offset() > guard.syntax().text_range().end() { - cov_mark::hit!(move_guard_unapplicable_in_arm_body); + cov_mark::hit!(move_guard_inapplicable_in_arm_body); return None; } let space_before_guard = guard.syntax().prev_sibling_or_token(); @@ -219,7 +219,7 @@ mod tests { #[test] fn move_guard_to_arm_body_range() { - cov_mark::check!(move_guard_unapplicable_in_arm_body); + cov_mark::check!(move_guard_inapplicable_in_arm_body); check_assist_not_applicable( move_guard_to_arm_body, r#" diff --git a/src/tools/rust-analyzer/crates/ide-assists/src/handlers/replace_if_let_with_match.rs b/src/tools/rust-analyzer/crates/ide-assists/src/handlers/replace_if_let_with_match.rs index f13b0b0713d..56dd6cf29ae 100644 --- a/src/tools/rust-analyzer/crates/ide-assists/src/handlers/replace_if_let_with_match.rs +++ b/src/tools/rust-analyzer/crates/ide-assists/src/handlers/replace_if_let_with_match.rs @@ -360,7 +360,7 @@ mod tests { use crate::tests::{check_assist, check_assist_not_applicable, check_assist_target}; #[test] - fn test_if_let_with_match_unapplicable_for_simple_ifs() { + fn test_if_let_with_match_inapplicable_for_simple_ifs() { check_assist_not_applicable( replace_if_let_with_match, r#" diff --git a/src/tools/rust-analyzer/crates/ide-assists/src/handlers/toggle_async_sugar.rs b/src/tools/rust-analyzer/crates/ide-assists/src/handlers/toggle_async_sugar.rs index 9ab36bf7757..8f937a04122 100644 --- a/src/tools/rust-analyzer/crates/ide-assists/src/handlers/toggle_async_sugar.rs +++ b/src/tools/rust-analyzer/crates/ide-assists/src/handlers/toggle_async_sugar.rs @@ -127,7 +127,7 @@ pub(crate) fn desugar_async_into_impl_future( let rparen = function.param_list()?.r_paren_token()?; let return_type = match function.ret_type() { - // unable to get a `ty` makes the action unapplicable + // unable to get a `ty` makes the action inapplicable Some(ret_type) => Some(ret_type.ty()?), // No type means `-> ()` None => None, diff --git a/src/tools/rust-analyzer/crates/ide-db/src/path_transform.rs b/src/tools/rust-analyzer/crates/ide-db/src/path_transform.rs index a508f2fedd6..156f21b784e 100644 --- a/src/tools/rust-analyzer/crates/ide-db/src/path_transform.rs +++ b/src/tools/rust-analyzer/crates/ide-db/src/path_transform.rs @@ -184,7 +184,7 @@ impl<'a> PathTransform<'a> { if let Some(expr) = v.expr() { // FIXME: expressions in curly brackets can cause ambiguity after insertion // (e.g. `N * 2` -> `{1 + 1} * 2`; it's unclear whether `{1 + 1}` - // is a standalone statement or a part of another expresson) + // is a standalone statement or a part of another expression) // and sometimes require slight modifications; see // https://doc.rust-lang.org/reference/statements.html#expression-statements // (default values in curly brackets can cause the same problem) |