Skip to content

Commit 4ed6346

Browse files
authored
Merge pull request rust-lang#20822 from Young-Flash/update_typos_checker
minor: update typos checker version
2 parents c7921c6 + 56cf2f2 commit 4ed6346

20 files changed

+21
-20
lines changed

src/tools/rust-analyzer/.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ jobs:
293293
timeout-minutes: 10
294294
env:
295295
FORCE_COLOR: 1
296-
TYPOS_VERSION: v1.28.3
296+
TYPOS_VERSION: v1.38.1
297297
steps:
298298
- name: download typos
299299
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

src/tools/rust-analyzer/.typos.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ makro = "makro"
3232
trivias = "trivias"
3333
thir = "thir"
3434
jod = "jod"
35+
tructure = "tructure"
3536

3637
[default.extend-identifiers]
3738
anc = "anc"

src/tools/rust-analyzer/crates/hir-ty/src/layout/target.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ pub fn target_data_layout_query(
3939
target,
4040
} => format!(r#"inconsistent target specification: "data-layout" claims pointers are {pointer_size}-bit, while "target-pointer-width" is `{target}`"#),
4141
TargetDataLayoutErrors::InvalidBitsSize { err } => err,
42-
TargetDataLayoutErrors::UnknownPointerSpecification { err } => format!(r#"use of unknown pointer specifer in "data-layout": {err}"#),
42+
TargetDataLayoutErrors::UnknownPointerSpecification { err } => format!(r#"use of unknown pointer specifier in "data-layout": {err}"#),
4343
}.into())
4444
}
4545
},

src/tools/rust-analyzer/crates/ide-assists/src/assist_config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl AssistConfig {
3838
}
3939
}
4040

41-
pub fn find_path_confg(&self, allow_unstable: bool) -> FindPathConfig {
41+
pub fn find_path_config(&self, allow_unstable: bool) -> FindPathConfig {
4242
FindPathConfig {
4343
prefer_no_std: self.prefer_no_std,
4444
prefer_prelude: self.prefer_prelude,

src/tools/rust-analyzer/crates/ide-assists/src/handlers/add_missing_match_arms.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ pub(crate) fn add_missing_match_arms(acc: &mut Assists, ctx: &AssistContext<'_>)
8080

8181
let scope = ctx.sema.scope(expr.syntax())?;
8282
let module = scope.module();
83-
let cfg = ctx.config.find_path_confg(ctx.sema.is_nightly(scope.krate()));
83+
let cfg = ctx.config.find_path_config(ctx.sema.is_nightly(scope.krate()));
8484
let self_ty = if ctx.config.prefer_self_ty {
8585
scope
8686
.containing_function()

src/tools/rust-analyzer/crates/ide-assists/src/handlers/convert_bool_to_enum.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ fn augment_references_with_imports(
346346
ImportScope::find_insert_use_container(name.syntax(), &ctx.sema).and_then(
347347
|import_scope| {
348348
let cfg =
349-
ctx.config.find_path_confg(ctx.sema.is_nightly(target_module.krate()));
349+
ctx.config.find_path_config(ctx.sema.is_nightly(target_module.krate()));
350350
let path = ref_module
351351
.find_use_path(
352352
ctx.sema.db,

src/tools/rust-analyzer/crates/ide-assists/src/handlers/convert_into_to_from.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub(crate) fn convert_into_to_from(acc: &mut Assists, ctx: &AssistContext<'_>) -
4343
return None;
4444
}
4545

46-
let cfg = ctx.config.find_path_confg(ctx.sema.is_nightly(module.krate()));
46+
let cfg = ctx.config.find_path_config(ctx.sema.is_nightly(module.krate()));
4747

4848
let src_type_path = {
4949
let src_type_path = src_type.syntax().descendants().find_map(ast::Path::cast)?;

src/tools/rust-analyzer/crates/ide-assists/src/handlers/convert_tuple_return_type_to_struct.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ fn augment_references_with_imports(
199199
{
200200
visited_modules.insert(ref_module);
201201

202-
let cfg = ctx.config.find_path_confg(ctx.sema.is_nightly(ref_module.krate()));
202+
let cfg = ctx.config.find_path_config(ctx.sema.is_nightly(ref_module.krate()));
203203
let import_scope =
204204
ImportScope::find_insert_use_container(new_name.syntax(), &ctx.sema);
205205
let path = ref_module

src/tools/rust-analyzer/crates/ide-assists/src/handlers/destructure_struct_binding.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ fn collect_data(ident_pat: ast::IdentPat, ctx: &AssistContext<'_>) -> Option<Str
8888
let hir::Adt::Struct(struct_type) = ty.strip_references().as_adt()? else { return None };
8989

9090
let module = ctx.sema.scope(ident_pat.syntax())?.module();
91-
let cfg = ctx.config.find_path_confg(ctx.sema.is_nightly(module.krate()));
91+
let cfg = ctx.config.find_path_config(ctx.sema.is_nightly(module.krate()));
9292
let struct_def = hir::ModuleDef::from(struct_type);
9393
let kind = struct_type.kind(ctx.db());
9494
let struct_def_path = module.find_path(ctx.db(), struct_def, cfg)?;

src/tools/rust-analyzer/crates/ide-assists/src/handlers/extract_function.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ pub(crate) fn extract_function(acc: &mut Assists, ctx: &AssistContext<'_>) -> Op
209209
FamousDefs(&ctx.sema, module.krate()).core_ops_ControlFlow();
210210

211211
if let Some(control_flow_enum) = control_flow_enum {
212-
let cfg = ctx.config.find_path_confg(ctx.sema.is_nightly(module.krate()));
212+
let cfg = ctx.config.find_path_config(ctx.sema.is_nightly(module.krate()));
213213
let mod_path = module.find_use_path(
214214
ctx.sema.db,
215215
ModuleDef::from(control_flow_enum),

0 commit comments

Comments
 (0)