about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-05-01 11:00:48 +0000
committerbors <bors@rust-lang.org>2022-05-01 11:00:48 +0000
commit5c88d9344c5b32988bfbfc090f50aba5de1db062 (patch)
treed026ca1bce3763d8215aa4f3570d637f0b37aa2b
parente025b37df6ce81dd6b26011130aa56076257bc39 (diff)
parentaade31943f957d9fbbf6f6852effdf48e0f2b3f5 (diff)
downloadrust-5c88d9344c5b32988bfbfc090f50aba5de1db062.tar.gz
rust-5c88d9344c5b32988bfbfc090f50aba5de1db062.zip
Auto merge of #12118 - randomicon00:fix#12102, r=lnicola
style: rename crates to kebab-case

Ref: #12102
I updated all the folders names as well as the crates names in each `Cargo.toml` to use kebab-case.

This is my first ra PR. In case I missed something, I am ready/available to fix it until it is ready to merge.

Thank you.
Diffstat
-rw-r--r--Cargo.lock164
-rw-r--r--Cargo.toml2
-rw-r--r--crates/base-db/Cargo.toml (renamed from crates/base_db/Cargo.toml)4
-rw-r--r--crates/base-db/src/change.rs (renamed from crates/base_db/src/change.rs)0
-rw-r--r--crates/base-db/src/fixture.rs (renamed from crates/base_db/src/fixture.rs)0
-rw-r--r--crates/base-db/src/input.rs (renamed from crates/base_db/src/input.rs)0
-rw-r--r--crates/base-db/src/lib.rs (renamed from crates/base_db/src/lib.rs)0
-rw-r--r--crates/hir-def/Cargo.toml (renamed from crates/hir_def/Cargo.toml)8
-rw-r--r--crates/hir-def/src/adt.rs (renamed from crates/hir_def/src/adt.rs)0
-rw-r--r--crates/hir-def/src/attr.rs (renamed from crates/hir_def/src/attr.rs)0
-rw-r--r--crates/hir-def/src/body.rs (renamed from crates/hir_def/src/body.rs)0
-rw-r--r--crates/hir-def/src/body/lower.rs (renamed from crates/hir_def/src/body/lower.rs)0
-rw-r--r--crates/hir-def/src/body/scope.rs (renamed from crates/hir_def/src/body/scope.rs)0
-rw-r--r--crates/hir-def/src/body/tests.rs (renamed from crates/hir_def/src/body/tests.rs)0
-rw-r--r--crates/hir-def/src/body/tests/block.rs (renamed from crates/hir_def/src/body/tests/block.rs)0
-rw-r--r--crates/hir-def/src/builtin_attr.rs (renamed from crates/hir_def/src/builtin_attr.rs)0
-rw-r--r--crates/hir-def/src/builtin_type.rs (renamed from crates/hir_def/src/builtin_type.rs)0
-rw-r--r--crates/hir-def/src/child_by_source.rs (renamed from crates/hir_def/src/child_by_source.rs)0
-rw-r--r--crates/hir-def/src/data.rs (renamed from crates/hir_def/src/data.rs)0
-rw-r--r--crates/hir-def/src/db.rs (renamed from crates/hir_def/src/db.rs)0
-rw-r--r--crates/hir-def/src/dyn_map.rs (renamed from crates/hir_def/src/dyn_map.rs)0
-rw-r--r--crates/hir-def/src/expr.rs (renamed from crates/hir_def/src/expr.rs)0
-rw-r--r--crates/hir-def/src/find_path.rs (renamed from crates/hir_def/src/find_path.rs)0
-rw-r--r--crates/hir-def/src/generics.rs (renamed from crates/hir_def/src/generics.rs)0
-rw-r--r--crates/hir-def/src/import_map.rs (renamed from crates/hir_def/src/import_map.rs)0
-rw-r--r--crates/hir-def/src/intern.rs (renamed from crates/hir_def/src/intern.rs)0
-rw-r--r--crates/hir-def/src/item_scope.rs (renamed from crates/hir_def/src/item_scope.rs)0
-rw-r--r--crates/hir-def/src/item_tree.rs (renamed from crates/hir_def/src/item_tree.rs)0
-rw-r--r--crates/hir-def/src/item_tree/lower.rs (renamed from crates/hir_def/src/item_tree/lower.rs)0
-rw-r--r--crates/hir-def/src/item_tree/pretty.rs (renamed from crates/hir_def/src/item_tree/pretty.rs)0
-rw-r--r--crates/hir-def/src/item_tree/tests.rs (renamed from crates/hir_def/src/item_tree/tests.rs)0
-rw-r--r--crates/hir-def/src/keys.rs (renamed from crates/hir_def/src/keys.rs)0
-rw-r--r--crates/hir-def/src/lang_item.rs (renamed from crates/hir_def/src/lang_item.rs)0
-rw-r--r--crates/hir-def/src/lib.rs (renamed from crates/hir_def/src/lib.rs)0
-rw-r--r--crates/hir-def/src/macro_expansion_tests.rs (renamed from crates/hir_def/src/macro_expansion_tests.rs)0
-rw-r--r--crates/hir-def/src/macro_expansion_tests/builtin_derive_macro.rs (renamed from crates/hir_def/src/macro_expansion_tests/builtin_derive_macro.rs)0
-rw-r--r--crates/hir-def/src/macro_expansion_tests/builtin_fn_macro.rs (renamed from crates/hir_def/src/macro_expansion_tests/builtin_fn_macro.rs)0
-rw-r--r--crates/hir-def/src/macro_expansion_tests/mbe.rs (renamed from crates/hir_def/src/macro_expansion_tests/mbe.rs)0
-rw-r--r--crates/hir-def/src/macro_expansion_tests/mbe/matching.rs (renamed from crates/hir_def/src/macro_expansion_tests/mbe/matching.rs)0
-rw-r--r--crates/hir-def/src/macro_expansion_tests/mbe/meta_syntax.rs (renamed from crates/hir_def/src/macro_expansion_tests/mbe/meta_syntax.rs)0
-rw-r--r--crates/hir-def/src/macro_expansion_tests/mbe/regression.rs (renamed from crates/hir_def/src/macro_expansion_tests/mbe/regression.rs)0
-rw-r--r--crates/hir-def/src/macro_expansion_tests/mbe/tt_conversion.rs (renamed from crates/hir_def/src/macro_expansion_tests/mbe/tt_conversion.rs)0
-rw-r--r--crates/hir-def/src/macro_expansion_tests/proc_macros.rs (renamed from crates/hir_def/src/macro_expansion_tests/proc_macros.rs)0
-rw-r--r--crates/hir-def/src/nameres.rs (renamed from crates/hir_def/src/nameres.rs)0
-rw-r--r--crates/hir-def/src/nameres/attr_resolution.rs (renamed from crates/hir_def/src/nameres/attr_resolution.rs)0
-rw-r--r--crates/hir-def/src/nameres/collector.rs (renamed from crates/hir_def/src/nameres/collector.rs)0
-rw-r--r--crates/hir-def/src/nameres/diagnostics.rs (renamed from crates/hir_def/src/nameres/diagnostics.rs)0
-rw-r--r--crates/hir-def/src/nameres/mod_resolution.rs (renamed from crates/hir_def/src/nameres/mod_resolution.rs)0
-rw-r--r--crates/hir-def/src/nameres/path_resolution.rs (renamed from crates/hir_def/src/nameres/path_resolution.rs)0
-rw-r--r--crates/hir-def/src/nameres/proc_macro.rs (renamed from crates/hir_def/src/nameres/proc_macro.rs)0
-rw-r--r--crates/hir-def/src/nameres/tests.rs (renamed from crates/hir_def/src/nameres/tests.rs)0
-rw-r--r--crates/hir-def/src/nameres/tests/globs.rs (renamed from crates/hir_def/src/nameres/tests/globs.rs)0
-rw-r--r--crates/hir-def/src/nameres/tests/incremental.rs (renamed from crates/hir_def/src/nameres/tests/incremental.rs)0
-rw-r--r--crates/hir-def/src/nameres/tests/macros.rs (renamed from crates/hir_def/src/nameres/tests/macros.rs)0
-rw-r--r--crates/hir-def/src/nameres/tests/mod_resolution.rs (renamed from crates/hir_def/src/nameres/tests/mod_resolution.rs)0
-rw-r--r--crates/hir-def/src/nameres/tests/primitives.rs (renamed from crates/hir_def/src/nameres/tests/primitives.rs)0
-rw-r--r--crates/hir-def/src/path.rs (renamed from crates/hir_def/src/path.rs)0
-rw-r--r--crates/hir-def/src/path/lower.rs (renamed from crates/hir_def/src/path/lower.rs)0
-rw-r--r--crates/hir-def/src/per_ns.rs (renamed from crates/hir_def/src/per_ns.rs)0
-rw-r--r--crates/hir-def/src/resolver.rs (renamed from crates/hir_def/src/resolver.rs)0
-rw-r--r--crates/hir-def/src/src.rs (renamed from crates/hir_def/src/src.rs)0
-rw-r--r--crates/hir-def/src/test_db.rs (renamed from crates/hir_def/src/test_db.rs)0
-rw-r--r--crates/hir-def/src/trace.rs (renamed from crates/hir_def/src/trace.rs)0
-rw-r--r--crates/hir-def/src/type_ref.rs (renamed from crates/hir_def/src/type_ref.rs)0
-rw-r--r--crates/hir-def/src/visibility.rs (renamed from crates/hir_def/src/visibility.rs)0
-rw-r--r--crates/hir-expand/Cargo.toml (renamed from crates/hir_expand/Cargo.toml)4
-rw-r--r--crates/hir-expand/src/ast_id_map.rs (renamed from crates/hir_expand/src/ast_id_map.rs)0
-rw-r--r--crates/hir-expand/src/builtin_attr_macro.rs (renamed from crates/hir_expand/src/builtin_attr_macro.rs)0
-rw-r--r--crates/hir-expand/src/builtin_derive_macro.rs (renamed from crates/hir_expand/src/builtin_derive_macro.rs)0
-rw-r--r--crates/hir-expand/src/builtin_fn_macro.rs (renamed from crates/hir_expand/src/builtin_fn_macro.rs)0
-rw-r--r--crates/hir-expand/src/db.rs (renamed from crates/hir_expand/src/db.rs)0
-rw-r--r--crates/hir-expand/src/eager.rs (renamed from crates/hir_expand/src/eager.rs)0
-rw-r--r--crates/hir-expand/src/fixup.rs (renamed from crates/hir_expand/src/fixup.rs)0
-rw-r--r--crates/hir-expand/src/hygiene.rs (renamed from crates/hir_expand/src/hygiene.rs)0
-rw-r--r--crates/hir-expand/src/lib.rs (renamed from crates/hir_expand/src/lib.rs)0
-rw-r--r--crates/hir-expand/src/mod_path.rs (renamed from crates/hir_expand/src/mod_path.rs)0
-rw-r--r--crates/hir-expand/src/name.rs (renamed from crates/hir_expand/src/name.rs)0
-rw-r--r--crates/hir-expand/src/proc_macro.rs (renamed from crates/hir_expand/src/proc_macro.rs)0
-rw-r--r--crates/hir-expand/src/quote.rs (renamed from crates/hir_expand/src/quote.rs)0
-rw-r--r--crates/hir-ty/Cargo.toml (renamed from crates/hir_ty/Cargo.toml)10
-rw-r--r--crates/hir-ty/src/autoderef.rs (renamed from crates/hir_ty/src/autoderef.rs)0
-rw-r--r--crates/hir-ty/src/builder.rs (renamed from crates/hir_ty/src/builder.rs)0
-rw-r--r--crates/hir-ty/src/chalk_db.rs (renamed from crates/hir_ty/src/chalk_db.rs)0
-rw-r--r--crates/hir-ty/src/chalk_ext.rs (renamed from crates/hir_ty/src/chalk_ext.rs)0
-rw-r--r--crates/hir-ty/src/consteval.rs (renamed from crates/hir_ty/src/consteval.rs)0
-rw-r--r--crates/hir-ty/src/consteval/tests.rs (renamed from crates/hir_ty/src/consteval/tests.rs)0
-rw-r--r--crates/hir-ty/src/db.rs (renamed from crates/hir_ty/src/db.rs)0
-rw-r--r--crates/hir-ty/src/diagnostics.rs (renamed from crates/hir_ty/src/diagnostics.rs)0
-rw-r--r--crates/hir-ty/src/diagnostics/decl_check.rs (renamed from crates/hir_ty/src/diagnostics/decl_check.rs)0
-rw-r--r--crates/hir-ty/src/diagnostics/decl_check/case_conv.rs (renamed from crates/hir_ty/src/diagnostics/decl_check/case_conv.rs)0
-rw-r--r--crates/hir-ty/src/diagnostics/expr.rs (renamed from crates/hir_ty/src/diagnostics/expr.rs)0
-rw-r--r--crates/hir-ty/src/diagnostics/match_check.rs (renamed from crates/hir_ty/src/diagnostics/match_check.rs)0
-rw-r--r--crates/hir-ty/src/diagnostics/match_check/deconstruct_pat.rs (renamed from crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs)0
-rw-r--r--crates/hir-ty/src/diagnostics/match_check/pat_util.rs (renamed from crates/hir_ty/src/diagnostics/match_check/pat_util.rs)0
-rw-r--r--crates/hir-ty/src/diagnostics/match_check/usefulness.rs (renamed from crates/hir_ty/src/diagnostics/match_check/usefulness.rs)0
-rw-r--r--crates/hir-ty/src/diagnostics/unsafe_check.rs (renamed from crates/hir_ty/src/diagnostics/unsafe_check.rs)0
-rw-r--r--crates/hir-ty/src/display.rs (renamed from crates/hir_ty/src/display.rs)0
-rw-r--r--crates/hir-ty/src/infer.rs (renamed from crates/hir_ty/src/infer.rs)0
-rw-r--r--crates/hir-ty/src/infer/closure.rs (renamed from crates/hir_ty/src/infer/closure.rs)0
-rw-r--r--crates/hir-ty/src/infer/coerce.rs (renamed from crates/hir_ty/src/infer/coerce.rs)0
-rw-r--r--crates/hir-ty/src/infer/expr.rs (renamed from crates/hir_ty/src/infer/expr.rs)0
-rw-r--r--crates/hir-ty/src/infer/pat.rs (renamed from crates/hir_ty/src/infer/pat.rs)0
-rw-r--r--crates/hir-ty/src/infer/path.rs (renamed from crates/hir_ty/src/infer/path.rs)0
-rw-r--r--crates/hir-ty/src/infer/unify.rs (renamed from crates/hir_ty/src/infer/unify.rs)0
-rw-r--r--crates/hir-ty/src/interner.rs (renamed from crates/hir_ty/src/interner.rs)0
-rw-r--r--crates/hir-ty/src/lib.rs (renamed from crates/hir_ty/src/lib.rs)0
-rw-r--r--crates/hir-ty/src/lower.rs (renamed from crates/hir_ty/src/lower.rs)0
-rw-r--r--crates/hir-ty/src/mapping.rs (renamed from crates/hir_ty/src/mapping.rs)0
-rw-r--r--crates/hir-ty/src/method_resolution.rs (renamed from crates/hir_ty/src/method_resolution.rs)0
-rw-r--r--crates/hir-ty/src/primitive.rs (renamed from crates/hir_ty/src/primitive.rs)0
-rw-r--r--crates/hir-ty/src/test_db.rs (renamed from crates/hir_ty/src/test_db.rs)0
-rw-r--r--crates/hir-ty/src/tests.rs (renamed from crates/hir_ty/src/tests.rs)0
-rw-r--r--crates/hir-ty/src/tests/coercion.rs (renamed from crates/hir_ty/src/tests/coercion.rs)0
-rw-r--r--crates/hir-ty/src/tests/diagnostics.rs (renamed from crates/hir_ty/src/tests/diagnostics.rs)0
-rw-r--r--crates/hir-ty/src/tests/display_source_code.rs (renamed from crates/hir_ty/src/tests/display_source_code.rs)0
-rw-r--r--crates/hir-ty/src/tests/incremental.rs (renamed from crates/hir_ty/src/tests/incremental.rs)0
-rw-r--r--crates/hir-ty/src/tests/macros.rs (renamed from crates/hir_ty/src/tests/macros.rs)0
-rw-r--r--crates/hir-ty/src/tests/method_resolution.rs (renamed from crates/hir_ty/src/tests/method_resolution.rs)0
-rw-r--r--crates/hir-ty/src/tests/never_type.rs (renamed from crates/hir_ty/src/tests/never_type.rs)0
-rw-r--r--crates/hir-ty/src/tests/patterns.rs (renamed from crates/hir_ty/src/tests/patterns.rs)0
-rw-r--r--crates/hir-ty/src/tests/regression.rs (renamed from crates/hir_ty/src/tests/regression.rs)0
-rw-r--r--crates/hir-ty/src/tests/simple.rs (renamed from crates/hir_ty/src/tests/simple.rs)0
-rw-r--r--crates/hir-ty/src/tests/traits.rs (renamed from crates/hir_ty/src/tests/traits.rs)0
-rw-r--r--crates/hir-ty/src/tls.rs (renamed from crates/hir_ty/src/tls.rs)0
-rw-r--r--crates/hir-ty/src/traits.rs (renamed from crates/hir_ty/src/traits.rs)0
-rw-r--r--crates/hir-ty/src/utils.rs (renamed from crates/hir_ty/src/utils.rs)0
-rw-r--r--crates/hir-ty/src/walk.rs (renamed from crates/hir_ty/src/walk.rs)0
-rw-r--r--crates/hir/Cargo.toml8
-rw-r--r--crates/ide-assists/Cargo.toml (renamed from crates/ide_assists/Cargo.toml)8
-rw-r--r--crates/ide-assists/src/assist_config.rs (renamed from crates/ide_assists/src/assist_config.rs)0
-rw-r--r--crates/ide-assists/src/assist_context.rs (renamed from crates/ide_assists/src/assist_context.rs)0
-rw-r--r--crates/ide-assists/src/handlers/add_explicit_type.rs (renamed from crates/ide_assists/src/handlers/add_explicit_type.rs)0
-rw-r--r--crates/ide-assists/src/handlers/add_lifetime_to_type.rs (renamed from crates/ide_assists/src/handlers/add_lifetime_to_type.rs)0
-rw-r--r--crates/ide-assists/src/handlers/add_missing_impl_members.rs (renamed from crates/ide_assists/src/handlers/add_missing_impl_members.rs)0
-rw-r--r--crates/ide-assists/src/handlers/add_missing_match_arms.rs (renamed from crates/ide_assists/src/handlers/add_missing_match_arms.rs)0
-rw-r--r--crates/ide-assists/src/handlers/add_return_type.rs (renamed from crates/ide_assists/src/handlers/add_return_type.rs)0
-rw-r--r--crates/ide-assists/src/handlers/add_turbo_fish.rs (renamed from crates/ide_assists/src/handlers/add_turbo_fish.rs)0
-rw-r--r--crates/ide-assists/src/handlers/apply_demorgan.rs (renamed from crates/ide_assists/src/handlers/apply_demorgan.rs)0
-rw-r--r--crates/ide-assists/src/handlers/auto_import.rs (renamed from crates/ide_assists/src/handlers/auto_import.rs)0
-rw-r--r--crates/ide-assists/src/handlers/change_visibility.rs (renamed from crates/ide_assists/src/handlers/change_visibility.rs)0
-rw-r--r--crates/ide-assists/src/handlers/convert_bool_then.rs (renamed from crates/ide_assists/src/handlers/convert_bool_then.rs)0
-rw-r--r--crates/ide-assists/src/handlers/convert_comment_block.rs (renamed from crates/ide_assists/src/handlers/convert_comment_block.rs)0
-rw-r--r--crates/ide-assists/src/handlers/convert_integer_literal.rs (renamed from crates/ide_assists/src/handlers/convert_integer_literal.rs)0
-rw-r--r--crates/ide-assists/src/handlers/convert_into_to_from.rs (renamed from crates/ide_assists/src/handlers/convert_into_to_from.rs)0
-rw-r--r--crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs (renamed from crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs)0
-rw-r--r--crates/ide-assists/src/handlers/convert_to_guarded_return.rs (renamed from crates/ide_assists/src/handlers/convert_to_guarded_return.rs)0
-rw-r--r--crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs (renamed from crates/ide_assists/src/handlers/convert_tuple_struct_to_named_struct.rs)0
-rw-r--r--crates/ide-assists/src/handlers/convert_while_to_loop.rs (renamed from crates/ide_assists/src/handlers/convert_while_to_loop.rs)0
-rw-r--r--crates/ide-assists/src/handlers/destructure_tuple_binding.rs (renamed from crates/ide_assists/src/handlers/destructure_tuple_binding.rs)0
-rw-r--r--crates/ide-assists/src/handlers/expand_glob_import.rs (renamed from crates/ide_assists/src/handlers/expand_glob_import.rs)0
-rw-r--r--crates/ide-assists/src/handlers/extract_function.rs (renamed from crates/ide_assists/src/handlers/extract_function.rs)0
-rw-r--r--crates/ide-assists/src/handlers/extract_module.rs (renamed from crates/ide_assists/src/handlers/extract_module.rs)0
-rw-r--r--crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs (renamed from crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs)0
-rw-r--r--crates/ide-assists/src/handlers/extract_type_alias.rs (renamed from crates/ide_assists/src/handlers/extract_type_alias.rs)0
-rw-r--r--crates/ide-assists/src/handlers/extract_variable.rs (renamed from crates/ide_assists/src/handlers/extract_variable.rs)0
-rw-r--r--crates/ide-assists/src/handlers/fix_visibility.rs (renamed from crates/ide_assists/src/handlers/fix_visibility.rs)0
-rw-r--r--crates/ide-assists/src/handlers/flip_binexpr.rs (renamed from crates/ide_assists/src/handlers/flip_binexpr.rs)0
-rw-r--r--crates/ide-assists/src/handlers/flip_comma.rs (renamed from crates/ide_assists/src/handlers/flip_comma.rs)0
-rw-r--r--crates/ide-assists/src/handlers/flip_trait_bound.rs (renamed from crates/ide_assists/src/handlers/flip_trait_bound.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_constant.rs (renamed from crates/ide_assists/src/handlers/generate_constant.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_default_from_enum_variant.rs (renamed from crates/ide_assists/src/handlers/generate_default_from_enum_variant.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_default_from_new.rs (renamed from crates/ide_assists/src/handlers/generate_default_from_new.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_delegate_methods.rs (renamed from crates/ide_assists/src/handlers/generate_delegate_methods.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_deref.rs (renamed from crates/ide_assists/src/handlers/generate_deref.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_derive.rs (renamed from crates/ide_assists/src/handlers/generate_derive.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_documentation_template.rs (renamed from crates/ide_assists/src/handlers/generate_documentation_template.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_enum_is_method.rs (renamed from crates/ide_assists/src/handlers/generate_enum_is_method.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_enum_projection_method.rs (renamed from crates/ide_assists/src/handlers/generate_enum_projection_method.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_from_impl_for_enum.rs (renamed from crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_function.rs (renamed from crates/ide_assists/src/handlers/generate_function.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_getter.rs (renamed from crates/ide_assists/src/handlers/generate_getter.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_impl.rs (renamed from crates/ide_assists/src/handlers/generate_impl.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_is_empty_from_len.rs (renamed from crates/ide_assists/src/handlers/generate_is_empty_from_len.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_new.rs (renamed from crates/ide_assists/src/handlers/generate_new.rs)0
-rw-r--r--crates/ide-assists/src/handlers/generate_setter.rs (renamed from crates/ide_assists/src/handlers/generate_setter.rs)0
-rw-r--r--crates/ide-assists/src/handlers/inline_call.rs (renamed from crates/ide_assists/src/handlers/inline_call.rs)0
-rw-r--r--crates/ide-assists/src/handlers/inline_local_variable.rs (renamed from crates/ide_assists/src/handlers/inline_local_variable.rs)0
-rw-r--r--crates/ide-assists/src/handlers/inline_type_alias.rs (renamed from crates/ide_assists/src/handlers/inline_type_alias.rs)0
-rw-r--r--crates/ide-assists/src/handlers/introduce_named_generic.rs (renamed from crates/ide_assists/src/handlers/introduce_named_generic.rs)0
-rw-r--r--crates/ide-assists/src/handlers/introduce_named_lifetime.rs (renamed from crates/ide_assists/src/handlers/introduce_named_lifetime.rs)0
-rw-r--r--crates/ide-assists/src/handlers/invert_if.rs (renamed from crates/ide_assists/src/handlers/invert_if.rs)0
-rw-r--r--crates/ide-assists/src/handlers/merge_imports.rs (renamed from crates/ide_assists/src/handlers/merge_imports.rs)0
-rw-r--r--crates/ide-assists/src/handlers/merge_match_arms.rs (renamed from crates/ide_assists/src/handlers/merge_match_arms.rs)0
-rw-r--r--crates/ide-assists/src/handlers/move_bounds.rs (renamed from crates/ide_assists/src/handlers/move_bounds.rs)0
-rw-r--r--crates/ide-assists/src/handlers/move_from_mod_rs.rs (renamed from crates/ide_assists/src/handlers/move_from_mod_rs.rs)0
-rw-r--r--crates/ide-assists/src/handlers/move_guard.rs (renamed from crates/ide_assists/src/handlers/move_guard.rs)0
-rw-r--r--crates/ide-assists/src/handlers/move_module_to_file.rs (renamed from crates/ide_assists/src/handlers/move_module_to_file.rs)0
-rw-r--r--crates/ide-assists/src/handlers/move_to_mod_rs.rs (renamed from crates/ide_assists/src/handlers/move_to_mod_rs.rs)0
-rw-r--r--crates/ide-assists/src/handlers/number_representation.rs (renamed from crates/ide_assists/src/handlers/number_representation.rs)0
-rw-r--r--crates/ide-assists/src/handlers/promote_local_to_const.rs (renamed from crates/ide_assists/src/handlers/promote_local_to_const.rs)0
-rw-r--r--crates/ide-assists/src/handlers/pull_assignment_up.rs (renamed from crates/ide_assists/src/handlers/pull_assignment_up.rs)0
-rw-r--r--crates/ide-assists/src/handlers/qualify_method_call.rs (renamed from crates/ide_assists/src/handlers/qualify_method_call.rs)0
-rw-r--r--crates/ide-assists/src/handlers/qualify_path.rs (renamed from crates/ide_assists/src/handlers/qualify_path.rs)0
-rw-r--r--crates/ide-assists/src/handlers/raw_string.rs (renamed from crates/ide_assists/src/handlers/raw_string.rs)0
-rw-r--r--crates/ide-assists/src/handlers/remove_dbg.rs (renamed from crates/ide_assists/src/handlers/remove_dbg.rs)0
-rw-r--r--crates/ide-assists/src/handlers/remove_mut.rs (renamed from crates/ide_assists/src/handlers/remove_mut.rs)0
-rw-r--r--crates/ide-assists/src/handlers/remove_unused_param.rs (renamed from crates/ide_assists/src/handlers/remove_unused_param.rs)0
-rw-r--r--crates/ide-assists/src/handlers/reorder_fields.rs (renamed from crates/ide_assists/src/handlers/reorder_fields.rs)0
-rw-r--r--crates/ide-assists/src/handlers/reorder_impl.rs (renamed from crates/ide_assists/src/handlers/reorder_impl.rs)0
-rw-r--r--crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs (renamed from crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs)0
-rw-r--r--crates/ide-assists/src/handlers/replace_if_let_with_match.rs (renamed from crates/ide_assists/src/handlers/replace_if_let_with_match.rs)0
-rw-r--r--crates/ide-assists/src/handlers/replace_let_with_if_let.rs (renamed from crates/ide_assists/src/handlers/replace_let_with_if_let.rs)0
-rw-r--r--crates/ide-assists/src/handlers/replace_qualified_name_with_use.rs (renamed from crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs)0
-rw-r--r--crates/ide-assists/src/handlers/replace_string_with_char.rs (renamed from crates/ide_assists/src/handlers/replace_string_with_char.rs)0
-rw-r--r--crates/ide-assists/src/handlers/replace_try_expr_with_match.rs (renamed from crates/ide_assists/src/handlers/replace_try_expr_with_match.rs)0
-rw-r--r--crates/ide-assists/src/handlers/replace_turbofish_with_explicit_type.rs (renamed from crates/ide_assists/src/handlers/replace_turbofish_with_explicit_type.rs)0
-rw-r--r--crates/ide-assists/src/handlers/sort_items.rs (renamed from crates/ide_assists/src/handlers/sort_items.rs)0
-rw-r--r--crates/ide-assists/src/handlers/split_import.rs (renamed from crates/ide_assists/src/handlers/split_import.rs)0
-rw-r--r--crates/ide-assists/src/handlers/toggle_ignore.rs (renamed from crates/ide_assists/src/handlers/toggle_ignore.rs)0
-rw-r--r--crates/ide-assists/src/handlers/unmerge_use.rs (renamed from crates/ide_assists/src/handlers/unmerge_use.rs)0
-rw-r--r--crates/ide-assists/src/handlers/unnecessary_async.rs (renamed from crates/ide_assists/src/handlers/unnecessary_async.rs)0
-rw-r--r--crates/ide-assists/src/handlers/unwrap_block.rs (renamed from crates/ide_assists/src/handlers/unwrap_block.rs)0
-rw-r--r--crates/ide-assists/src/handlers/unwrap_result_return_type.rs (renamed from crates/ide_assists/src/handlers/unwrap_result_return_type.rs)0
-rw-r--r--crates/ide-assists/src/handlers/wrap_return_type_in_result.rs (renamed from crates/ide_assists/src/handlers/wrap_return_type_in_result.rs)0
-rw-r--r--crates/ide-assists/src/lib.rs (renamed from crates/ide_assists/src/lib.rs)0
-rw-r--r--crates/ide-assists/src/tests.rs (renamed from crates/ide_assists/src/tests.rs)0
-rw-r--r--crates/ide-assists/src/tests/generated.rs (renamed from crates/ide_assists/src/tests/generated.rs)0
-rw-r--r--crates/ide-assists/src/tests/sourcegen.rs (renamed from crates/ide_assists/src/tests/sourcegen.rs)4
-rw-r--r--crates/ide-assists/src/utils.rs (renamed from crates/ide_assists/src/utils.rs)0
-rw-r--r--crates/ide-assists/src/utils/gen_trait_fn_body.rs (renamed from crates/ide_assists/src/utils/gen_trait_fn_body.rs)0
-rw-r--r--crates/ide-assists/src/utils/suggest_name.rs (renamed from crates/ide_assists/src/utils/suggest_name.rs)0
-rw-r--r--crates/ide-completion/Cargo.toml (renamed from crates/ide_completion/Cargo.toml)12
-rw-r--r--crates/ide-completion/src/completions.rs (renamed from crates/ide_completion/src/completions.rs)0
-rw-r--r--crates/ide-completion/src/completions/attribute.rs (renamed from crates/ide_completion/src/completions/attribute.rs)0
-rw-r--r--crates/ide-completion/src/completions/attribute/cfg.rs (renamed from crates/ide_completion/src/completions/attribute/cfg.rs)0
-rw-r--r--crates/ide-completion/src/completions/attribute/derive.rs (renamed from crates/ide_completion/src/completions/attribute/derive.rs)0
-rw-r--r--crates/ide-completion/src/completions/attribute/lint.rs (renamed from crates/ide_completion/src/completions/attribute/lint.rs)0
-rw-r--r--crates/ide-completion/src/completions/attribute/repr.rs (renamed from crates/ide_completion/src/completions/attribute/repr.rs)0
-rw-r--r--crates/ide-completion/src/completions/dot.rs (renamed from crates/ide_completion/src/completions/dot.rs)0
-rw-r--r--crates/ide-completion/src/completions/extern_abi.rs (renamed from crates/ide_completion/src/completions/extern_abi.rs)0
-rw-r--r--crates/ide-completion/src/completions/flyimport.rs (renamed from crates/ide_completion/src/completions/flyimport.rs)0
-rw-r--r--crates/ide-completion/src/completions/fn_param.rs (renamed from crates/ide_completion/src/completions/fn_param.rs)0
-rw-r--r--crates/ide-completion/src/completions/format_string.rs (renamed from crates/ide_completion/src/completions/format_string.rs)0
-rw-r--r--crates/ide-completion/src/completions/keyword.rs (renamed from crates/ide_completion/src/completions/keyword.rs)0
-rw-r--r--crates/ide-completion/src/completions/lifetime.rs (renamed from crates/ide_completion/src/completions/lifetime.rs)0
-rw-r--r--crates/ide-completion/src/completions/mod_.rs (renamed from crates/ide_completion/src/completions/mod_.rs)0
-rw-r--r--crates/ide-completion/src/completions/pattern.rs (renamed from crates/ide_completion/src/completions/pattern.rs)0
-rw-r--r--crates/ide-completion/src/completions/postfix.rs (renamed from crates/ide_completion/src/completions/postfix.rs)0
-rw-r--r--crates/ide-completion/src/completions/postfix/format_like.rs (renamed from crates/ide_completion/src/completions/postfix/format_like.rs)0
-rw-r--r--crates/ide-completion/src/completions/qualified_path.rs (renamed from crates/ide_completion/src/completions/qualified_path.rs)0
-rw-r--r--crates/ide-completion/src/completions/record.rs (renamed from crates/ide_completion/src/completions/record.rs)0
-rw-r--r--crates/ide-completion/src/completions/snippet.rs (renamed from crates/ide_completion/src/completions/snippet.rs)0
-rw-r--r--crates/ide-completion/src/completions/trait_impl.rs (renamed from crates/ide_completion/src/completions/trait_impl.rs)0
-rw-r--r--crates/ide-completion/src/completions/unqualified_path.rs (renamed from crates/ide_completion/src/completions/unqualified_path.rs)0
-rw-r--r--crates/ide-completion/src/completions/use_.rs (renamed from crates/ide_completion/src/completions/use_.rs)0
-rw-r--r--crates/ide-completion/src/completions/vis.rs (renamed from crates/ide_completion/src/completions/vis.rs)0
-rw-r--r--crates/ide-completion/src/config.rs (renamed from crates/ide_completion/src/config.rs)0
-rw-r--r--crates/ide-completion/src/context.rs (renamed from crates/ide_completion/src/context.rs)0
-rw-r--r--crates/ide-completion/src/item.rs (renamed from crates/ide_completion/src/item.rs)0
-rw-r--r--crates/ide-completion/src/lib.rs (renamed from crates/ide_completion/src/lib.rs)0
-rw-r--r--crates/ide-completion/src/patterns.rs (renamed from crates/ide_completion/src/patterns.rs)0
-rw-r--r--crates/ide-completion/src/render.rs (renamed from crates/ide_completion/src/render.rs)0
-rw-r--r--crates/ide-completion/src/render/const_.rs (renamed from crates/ide_completion/src/render/const_.rs)0
-rw-r--r--crates/ide-completion/src/render/function.rs (renamed from crates/ide_completion/src/render/function.rs)0
-rw-r--r--crates/ide-completion/src/render/literal.rs (renamed from crates/ide_completion/src/render/literal.rs)0
-rw-r--r--crates/ide-completion/src/render/macro_.rs (renamed from crates/ide_completion/src/render/macro_.rs)0
-rw-r--r--crates/ide-completion/src/render/pattern.rs (renamed from crates/ide_completion/src/render/pattern.rs)0
-rw-r--r--crates/ide-completion/src/render/type_alias.rs (renamed from crates/ide_completion/src/render/type_alias.rs)0
-rw-r--r--crates/ide-completion/src/render/union_literal.rs (renamed from crates/ide_completion/src/render/union_literal.rs)0
-rw-r--r--crates/ide-completion/src/render/variant.rs (renamed from crates/ide_completion/src/render/variant.rs)0
-rw-r--r--crates/ide-completion/src/snippet.rs (renamed from crates/ide_completion/src/snippet.rs)0
-rw-r--r--crates/ide-completion/src/tests.rs (renamed from crates/ide_completion/src/tests.rs)0
-rw-r--r--crates/ide-completion/src/tests/attribute.rs (renamed from crates/ide_completion/src/tests/attribute.rs)0
-rw-r--r--crates/ide-completion/src/tests/expression.rs (renamed from crates/ide_completion/src/tests/expression.rs)0
-rw-r--r--crates/ide-completion/src/tests/flyimport.rs (renamed from crates/ide_completion/src/tests/flyimport.rs)0
-rw-r--r--crates/ide-completion/src/tests/fn_param.rs (renamed from crates/ide_completion/src/tests/fn_param.rs)0
-rw-r--r--crates/ide-completion/src/tests/item.rs (renamed from crates/ide_completion/src/tests/item.rs)0
-rw-r--r--crates/ide-completion/src/tests/item_list.rs (renamed from crates/ide_completion/src/tests/item_list.rs)0
-rw-r--r--crates/ide-completion/src/tests/pattern.rs (renamed from crates/ide_completion/src/tests/pattern.rs)0
-rw-r--r--crates/ide-completion/src/tests/predicate.rs (renamed from crates/ide_completion/src/tests/predicate.rs)0
-rw-r--r--crates/ide-completion/src/tests/proc_macros.rs (renamed from crates/ide_completion/src/tests/proc_macros.rs)0
-rw-r--r--crates/ide-completion/src/tests/record.rs (renamed from crates/ide_completion/src/tests/record.rs)0
-rw-r--r--crates/ide-completion/src/tests/type_pos.rs (renamed from crates/ide_completion/src/tests/type_pos.rs)0
-rw-r--r--crates/ide-completion/src/tests/use_tree.rs (renamed from crates/ide_completion/src/tests/use_tree.rs)0
-rw-r--r--crates/ide-completion/src/tests/visibility.rs (renamed from crates/ide_completion/src/tests/visibility.rs)0
-rw-r--r--crates/ide-db/Cargo.toml (renamed from crates/ide_db/Cargo.toml)10
-rw-r--r--crates/ide-db/src/active_parameter.rs (renamed from crates/ide_db/src/active_parameter.rs)0
-rw-r--r--crates/ide-db/src/apply_change.rs (renamed from crates/ide_db/src/apply_change.rs)0
-rw-r--r--crates/ide-db/src/assists.rs (renamed from crates/ide_db/src/assists.rs)0
-rw-r--r--crates/ide-db/src/defs.rs (renamed from crates/ide_db/src/defs.rs)0
-rw-r--r--crates/ide-db/src/famous_defs.rs (renamed from crates/ide_db/src/famous_defs.rs)0
-rw-r--r--crates/ide-db/src/generated/lints.rs (renamed from crates/ide_db/src/generated/lints.rs)0
-rw-r--r--crates/ide-db/src/helpers.rs (renamed from crates/ide_db/src/helpers.rs)0
-rw-r--r--crates/ide-db/src/imports/import_assets.rs (renamed from crates/ide_db/src/imports/import_assets.rs)0
-rw-r--r--crates/ide-db/src/imports/insert_use.rs (renamed from crates/ide_db/src/imports/insert_use.rs)0
-rw-r--r--crates/ide-db/src/imports/insert_use/tests.rs (renamed from crates/ide_db/src/imports/insert_use/tests.rs)0
-rw-r--r--crates/ide-db/src/imports/merge_imports.rs (renamed from crates/ide_db/src/imports/merge_imports.rs)0
-rw-r--r--crates/ide-db/src/items_locator.rs (renamed from crates/ide_db/src/items_locator.rs)0
-rw-r--r--crates/ide-db/src/label.rs (renamed from crates/ide_db/src/label.rs)0
-rw-r--r--crates/ide-db/src/lib.rs (renamed from crates/ide_db/src/lib.rs)0
-rw-r--r--crates/ide-db/src/line_index.rs (renamed from crates/ide_db/src/line_index.rs)0
-rw-r--r--crates/ide-db/src/path_transform.rs (renamed from crates/ide_db/src/path_transform.rs)0
-rw-r--r--crates/ide-db/src/rename.rs (renamed from crates/ide_db/src/rename.rs)0
-rw-r--r--crates/ide-db/src/rust_doc.rs (renamed from crates/ide_db/src/rust_doc.rs)0
-rw-r--r--crates/ide-db/src/search.rs (renamed from crates/ide_db/src/search.rs)0
-rw-r--r--crates/ide-db/src/source_change.rs (renamed from crates/ide_db/src/source_change.rs)0
-rw-r--r--crates/ide-db/src/symbol_index.rs (renamed from crates/ide_db/src/symbol_index.rs)0
-rw-r--r--crates/ide-db/src/syntax_helpers/format_string.rs (renamed from crates/ide_db/src/syntax_helpers/format_string.rs)0
-rw-r--r--crates/ide-db/src/syntax_helpers/insert_whitespace_into_node.rs (renamed from crates/ide_db/src/syntax_helpers/insert_whitespace_into_node.rs)0
-rw-r--r--crates/ide-db/src/syntax_helpers/node_ext.rs (renamed from crates/ide_db/src/syntax_helpers/node_ext.rs)0
-rw-r--r--crates/ide-db/src/test_data/test_symbol_index_collection.txt (renamed from crates/ide_db/src/test_data/test_symbol_index_collection.txt)0
-rw-r--r--crates/ide-db/src/tests/sourcegen_lints.rs (renamed from crates/ide_db/src/tests/sourcegen_lints.rs)0
-rw-r--r--crates/ide-db/src/traits.rs (renamed from crates/ide_db/src/traits.rs)0
-rw-r--r--crates/ide-db/src/ty_filter.rs (renamed from crates/ide_db/src/ty_filter.rs)0
-rw-r--r--crates/ide-diagnostics/Cargo.toml (renamed from crates/ide_diagnostics/Cargo.toml)8
-rw-r--r--crates/ide-diagnostics/src/handlers/break_outside_of_loop.rs (renamed from crates/ide_diagnostics/src/handlers/break_outside_of_loop.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/field_shorthand.rs (renamed from crates/ide_diagnostics/src/handlers/field_shorthand.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/inactive_code.rs (renamed from crates/ide_diagnostics/src/handlers/inactive_code.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/incorrect_case.rs (renamed from crates/ide_diagnostics/src/handlers/incorrect_case.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/invalid_derive_target.rs (renamed from crates/ide_diagnostics/src/handlers/invalid_derive_target.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/macro_error.rs (renamed from crates/ide_diagnostics/src/handlers/macro_error.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/malformed_derive.rs (renamed from crates/ide_diagnostics/src/handlers/malformed_derive.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/mismatched_arg_count.rs (renamed from crates/ide_diagnostics/src/handlers/mismatched_arg_count.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/missing_fields.rs (renamed from crates/ide_diagnostics/src/handlers/missing_fields.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/missing_match_arms.rs (renamed from crates/ide_diagnostics/src/handlers/missing_match_arms.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/missing_unsafe.rs (renamed from crates/ide_diagnostics/src/handlers/missing_unsafe.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/no_such_field.rs (renamed from crates/ide_diagnostics/src/handlers/no_such_field.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/replace_filter_map_next_with_find_map.rs (renamed from crates/ide_diagnostics/src/handlers/replace_filter_map_next_with_find_map.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/type_mismatch.rs (renamed from crates/ide_diagnostics/src/handlers/type_mismatch.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/unimplemented_builtin_macro.rs (renamed from crates/ide_diagnostics/src/handlers/unimplemented_builtin_macro.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/unlinked_file.rs (renamed from crates/ide_diagnostics/src/handlers/unlinked_file.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/unresolved_extern_crate.rs (renamed from crates/ide_diagnostics/src/handlers/unresolved_extern_crate.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/unresolved_import.rs (renamed from crates/ide_diagnostics/src/handlers/unresolved_import.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/unresolved_macro_call.rs (renamed from crates/ide_diagnostics/src/handlers/unresolved_macro_call.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/unresolved_module.rs (renamed from crates/ide_diagnostics/src/handlers/unresolved_module.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/unresolved_proc_macro.rs (renamed from crates/ide_diagnostics/src/handlers/unresolved_proc_macro.rs)0
-rw-r--r--crates/ide-diagnostics/src/handlers/useless_braces.rs (renamed from crates/ide_diagnostics/src/handlers/useless_braces.rs)0
-rw-r--r--crates/ide-diagnostics/src/lib.rs (renamed from crates/ide_diagnostics/src/lib.rs)0
-rw-r--r--crates/ide-diagnostics/src/tests.rs (renamed from crates/ide_diagnostics/src/tests.rs)0
-rw-r--r--crates/ide-diagnostics/src/tests/sourcegen.rs (renamed from crates/ide_diagnostics/src/tests/sourcegen.rs)2
-rw-r--r--crates/ide-ssr/Cargo.toml (renamed from crates/ide_ssr/Cargo.toml)8
-rw-r--r--crates/ide-ssr/src/errors.rs (renamed from crates/ide_ssr/src/errors.rs)0
-rw-r--r--crates/ide-ssr/src/fragments.rs (renamed from crates/ide_ssr/src/fragments.rs)0
-rw-r--r--crates/ide-ssr/src/from_comment.rs (renamed from crates/ide_ssr/src/from_comment.rs)0
-rw-r--r--crates/ide-ssr/src/lib.rs (renamed from crates/ide_ssr/src/lib.rs)0
-rw-r--r--crates/ide-ssr/src/matching.rs (renamed from crates/ide_ssr/src/matching.rs)0
-rw-r--r--crates/ide-ssr/src/nester.rs (renamed from crates/ide_ssr/src/nester.rs)0
-rw-r--r--crates/ide-ssr/src/parsing.rs (renamed from crates/ide_ssr/src/parsing.rs)0
-rw-r--r--crates/ide-ssr/src/replacing.rs (renamed from crates/ide_ssr/src/replacing.rs)0
-rw-r--r--crates/ide-ssr/src/resolving.rs (renamed from crates/ide_ssr/src/resolving.rs)0
-rw-r--r--crates/ide-ssr/src/search.rs (renamed from crates/ide_ssr/src/search.rs)0
-rw-r--r--crates/ide-ssr/src/tests.rs (renamed from crates/ide_ssr/src/tests.rs)0
-rw-r--r--crates/ide/Cargo.toml16
-rw-r--r--crates/mbe/Cargo.toml2
-rw-r--r--crates/proc-macro-api/Cargo.toml (renamed from crates/proc_macro_api/Cargo.toml)4
-rw-r--r--crates/proc-macro-api/src/lib.rs (renamed from crates/proc_macro_api/src/lib.rs)0
-rw-r--r--crates/proc-macro-api/src/msg.rs (renamed from crates/proc_macro_api/src/msg.rs)0
-rw-r--r--crates/proc-macro-api/src/msg/flat.rs (renamed from crates/proc_macro_api/src/msg/flat.rs)0
-rw-r--r--crates/proc-macro-api/src/process.rs (renamed from crates/proc_macro_api/src/process.rs)0
-rw-r--r--crates/proc-macro-api/src/version.rs (renamed from crates/proc_macro_api/src/version.rs)0
-rw-r--r--crates/proc-macro-srv/Cargo.toml (renamed from crates/proc_macro_srv/Cargo.toml)6
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_48/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_48/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/buffer.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/buffer.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/client.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/client.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/closure.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/closure.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/handle.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/handle.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/rpc.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/rpc.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/scoped_cell.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/scoped_cell.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/server.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/server.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/diagnostic.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/diagnostic.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_48/rustc_server.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_48/rustc_server.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_54/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_54/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/buffer.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/buffer.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/client.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/client.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/closure.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/closure.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/handle.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/handle.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/rpc.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/rpc.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/scoped_cell.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/scoped_cell.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/server.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/server.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/diagnostic.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/diagnostic.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_54/rustc_server.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_54/rustc_server.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_56/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_56/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/buffer.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/buffer.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/client.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/client.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/closure.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/closure.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/handle.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/handle.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/rpc.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/rpc.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/scoped_cell.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/scoped_cell.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/server.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/server.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/diagnostic.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/diagnostic.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/quote.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/quote.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_56/rustc_server.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_56/rustc_server.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_57/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_57/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/buffer.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/buffer.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/client.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/client.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/closure.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/closure.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/handle.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/handle.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/rpc.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/rpc.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/scoped_cell.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/scoped_cell.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/server.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/server.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/diagnostic.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/diagnostic.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/quote.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/quote.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_57/rustc_server.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_57/rustc_server.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_58/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_58/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/buffer.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/buffer.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/client.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/client.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/closure.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/closure.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/handle.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/handle.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/rpc.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/rpc.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/scoped_cell.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/scoped_cell.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/server.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/server.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/diagnostic.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/diagnostic.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/mod.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/quote.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/quote.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/abi_1_58/rustc_server.rs (renamed from crates/proc_macro_srv/src/abis/abi_1_58/rustc_server.rs)0
-rw-r--r--crates/proc-macro-srv/src/abis/mod.rs (renamed from crates/proc_macro_srv/src/abis/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/cli.rs (renamed from crates/proc_macro_srv/src/cli.rs)0
-rw-r--r--crates/proc-macro-srv/src/dylib.rs (renamed from crates/proc_macro_srv/src/dylib.rs)0
-rw-r--r--crates/proc-macro-srv/src/lib.rs (renamed from crates/proc_macro_srv/src/lib.rs)0
-rw-r--r--crates/proc-macro-srv/src/tests/mod.rs (renamed from crates/proc_macro_srv/src/tests/mod.rs)0
-rw-r--r--crates/proc-macro-srv/src/tests/utils.rs (renamed from crates/proc_macro_srv/src/tests/utils.rs)0
-rw-r--r--crates/proc-macro-test/Cargo.toml (renamed from crates/proc_macro_test/Cargo.toml)4
-rw-r--r--crates/proc-macro-test/build.rs (renamed from crates/proc_macro_test/build.rs)8
-rw-r--r--crates/proc-macro-test/imp/.gitignore (renamed from crates/proc_macro_test/imp/.gitignore)0
-rw-r--r--crates/proc-macro-test/imp/Cargo.toml (renamed from crates/proc_macro_test/imp/Cargo.toml)2
-rw-r--r--crates/proc-macro-test/imp/src/lib.rs (renamed from crates/proc_macro_test/imp/src/lib.rs)0
-rw-r--r--crates/proc-macro-test/src/lib.rs (renamed from crates/proc_macro_test/src/lib.rs)0
-rw-r--r--crates/project-model/Cargo.toml (renamed from crates/project_model/Cargo.toml)4
-rw-r--r--crates/project-model/src/build_scripts.rs (renamed from crates/project_model/src/build_scripts.rs)0
-rw-r--r--crates/project-model/src/cargo_workspace.rs (renamed from crates/project_model/src/cargo_workspace.rs)0
-rw-r--r--crates/project-model/src/cfg_flag.rs (renamed from crates/project_model/src/cfg_flag.rs)0
-rw-r--r--crates/project-model/src/lib.rs (renamed from crates/project_model/src/lib.rs)0
-rw-r--r--crates/project-model/src/manifest_path.rs (renamed from crates/project_model/src/manifest_path.rs)0
-rw-r--r--crates/project-model/src/project_json.rs (renamed from crates/project_model/src/project_json.rs)0
-rw-r--r--crates/project-model/src/rustc_cfg.rs (renamed from crates/project_model/src/rustc_cfg.rs)0
-rw-r--r--crates/project-model/src/sysroot.rs (renamed from crates/project_model/src/sysroot.rs)0
-rw-r--r--crates/project-model/src/tests.rs (renamed from crates/project_model/src/tests.rs)0
-rw-r--r--crates/project-model/src/workspace.rs (renamed from crates/project_model/src/workspace.rs)0
-rw-r--r--crates/project-model/test_data/fake-sysroot/alloc/src/lib.rs (renamed from crates/project_model/test_data/fake-sysroot/alloc/src/lib.rs)0
-rw-r--r--crates/project-model/test_data/fake-sysroot/core/src/lib.rs (renamed from crates/project_model/test_data/fake-sysroot/core/src/lib.rs)0
-rw-r--r--crates/project-model/test_data/fake-sysroot/panic_abort/src/lib.rs (renamed from crates/project_model/test_data/fake-sysroot/panic_abort/src/lib.rs)0
-rw-r--r--crates/project-model/test_data/fake-sysroot/panic_unwind/src/lib.rs (renamed from crates/project_model/test_data/fake-sysroot/panic_unwind/src/lib.rs)0
-rw-r--r--crates/project-model/test_data/fake-sysroot/proc_macro/src/lib.rs (renamed from crates/project_model/test_data/fake-sysroot/proc_macro/src/lib.rs)0
-rw-r--r--crates/project-model/test_data/fake-sysroot/profiler_builtins/src/lib.rs (renamed from crates/project_model/test_data/fake-sysroot/profiler_builtins/src/lib.rs)0
-rw-r--r--crates/project-model/test_data/fake-sysroot/std/src/lib.rs (renamed from crates/project_model/test_data/fake-sysroot/std/src/lib.rs)0
-rw-r--r--crates/project-model/test_data/fake-sysroot/stdarch/crates/std_detect/src/lib.rs (renamed from crates/project_model/test_data/fake-sysroot/stdarch/crates/std_detect/src/lib.rs)0
-rw-r--r--crates/project-model/test_data/fake-sysroot/term/src/lib.rs (renamed from crates/project_model/test_data/fake-sysroot/term/src/lib.rs)0
-rw-r--r--crates/project-model/test_data/fake-sysroot/test/src/lib.rs (renamed from crates/project_model/test_data/fake-sysroot/test/src/lib.rs)0
-rw-r--r--crates/project-model/test_data/fake-sysroot/unwind/src/lib.rs (renamed from crates/project_model/test_data/fake-sysroot/unwind/src/lib.rs)0
-rw-r--r--crates/project-model/test_data/hello-world-metadata.json (renamed from crates/project_model/test_data/hello-world-metadata.json)0
-rw-r--r--crates/project-model/test_data/hello-world-project.json (renamed from crates/project_model/test_data/hello-world-project.json)0
-rw-r--r--crates/project-model/test_data/is-proc-macro-project.json (renamed from crates/project_model/test_data/is-proc-macro-project.json)0
-rw-r--r--crates/rust-analyzer/Cargo.toml16
-rw-r--r--crates/rust-analyzer/tests/slow-tests/tidy.rs32
-rw-r--r--crates/syntax/Cargo.toml4
-rw-r--r--crates/test-utils/Cargo.toml (renamed from crates/test_utils/Cargo.toml)2
-rw-r--r--crates/test-utils/src/assert_linear.rs (renamed from crates/test_utils/src/assert_linear.rs)0
-rw-r--r--crates/test-utils/src/bench_fixture.rs (renamed from crates/test_utils/src/bench_fixture.rs)0
-rw-r--r--crates/test-utils/src/fixture.rs (renamed from crates/test_utils/src/fixture.rs)0
-rw-r--r--crates/test-utils/src/lib.rs (renamed from crates/test_utils/src/lib.rs)0
-rw-r--r--crates/test-utils/src/minicore.rs (renamed from crates/test_utils/src/minicore.rs)0
-rw-r--r--crates/text-edit/Cargo.toml (renamed from crates/text_edit/Cargo.toml)2
-rw-r--r--crates/text-edit/src/lib.rs (renamed from crates/text_edit/src/lib.rs)0
462 files changed, 177 insertions, 177 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 2850895d659..051906f87c4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -92,7 +92,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "base_db"
+name = "base-db"
 version = "0.0.0"
 dependencies = [
  "cfg",
@@ -101,7 +101,7 @@ dependencies = [
  "salsa",
  "stdx",
  "syntax",
- "test_utils",
+ "test-utils",
  "tt",
  "vfs",
 ]
@@ -474,12 +474,12 @@ name = "hir"
 version = "0.0.0"
 dependencies = [
  "arrayvec",
- "base_db",
+ "base-db",
  "cfg",
  "either",
- "hir_def",
- "hir_expand",
- "hir_ty",
+ "hir-def",
+ "hir-expand",
+ "hir-ty",
  "itertools",
  "once_cell",
  "profile",
@@ -491,12 +491,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "hir_def"
+name = "hir-def"
 version = "0.0.0"
 dependencies = [
  "anymap",
  "arrayvec",
- "base_db",
+ "base-db",
  "bitflags",
  "cfg",
  "cov-mark",
@@ -505,7 +505,7 @@ dependencies = [
  "either",
  "expect-test",
  "fst",
- "hir_expand",
+ "hir-expand",
  "indexmap",
  "itertools",
  "la-arena",
@@ -519,16 +519,16 @@ dependencies = [
  "smallvec",
  "stdx",
  "syntax",
- "test_utils",
+ "test-utils",
  "tracing",
  "tt",
 ]
 
 [[package]]
-name = "hir_expand"
+name = "hir-expand"
 version = "0.0.0"
 dependencies = [
- "base_db",
+ "base-db",
  "cfg",
  "cov-mark",
  "either",
@@ -546,19 +546,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "hir_ty"
+name = "hir-ty"
 version = "0.0.0"
 dependencies = [
  "arrayvec",
- "base_db",
+ "base-db",
  "chalk-ir",
  "chalk-recursive",
  "chalk-solve",
  "cov-mark",
  "ena",
  "expect-test",
- "hir_def",
- "hir_expand",
+ "hir-def",
+ "hir-expand",
  "itertools",
  "la-arena",
  "limit",
@@ -569,7 +569,7 @@ dependencies = [
  "smallvec",
  "stdx",
  "syntax",
- "test_utils",
+ "test-utils",
  "tracing",
  "tracing-subscriber",
  "tracing-tree",
@@ -596,11 +596,11 @@ dependencies = [
  "either",
  "expect-test",
  "hir",
- "ide_assists",
- "ide_completion",
- "ide_db",
- "ide_diagnostics",
- "ide_ssr",
+ "ide-assists",
+ "ide-completion",
+ "ide-db",
+ "ide-diagnostics",
+ "ide-ssr",
  "itertools",
  "oorandom",
  "profile",
@@ -608,56 +608,56 @@ dependencies = [
  "pulldown-cmark-to-cmark",
  "stdx",
  "syntax",
- "test_utils",
- "text_edit",
+ "test-utils",
+ "text-edit",
  "toolchain",
  "tracing",
  "url",
 ]
 
 [[package]]
-name = "ide_assists"
+name = "ide-assists"
 version = "0.0.0"
 dependencies = [
  "cov-mark",
  "either",
  "expect-test",
  "hir",
- "ide_db",
+ "ide-db",
  "itertools",
  "profile",
  "sourcegen",
  "stdx",
  "syntax",
- "test_utils",
- "text_edit",
+ "test-utils",
+ "text-edit",
 ]
 
 [[package]]
-name = "ide_completion"
+name = "ide-completion"
 version = "0.0.0"
 dependencies = [
- "base_db",
+ "base-db",
  "cov-mark",
  "expect-test",
  "hir",
- "ide_db",
+ "ide-db",
  "itertools",
  "once_cell",
  "profile",
  "smallvec",
  "stdx",
  "syntax",
- "test_utils",
- "text_edit",
+ "test-utils",
+ "text-edit",
 ]
 
 [[package]]
-name = "ide_db"
+name = "ide-db"
 version = "0.0.0"
 dependencies = [
  "arrayvec",
- "base_db",
+ "base-db",
  "cov-mark",
  "either",
  "expect-test",
@@ -674,14 +674,14 @@ dependencies = [
  "sourcegen",
  "stdx",
  "syntax",
- "test_utils",
- "text_edit",
+ "test-utils",
+ "text-edit",
  "tracing",
  "xshell",
 ]
 
 [[package]]
-name = "ide_diagnostics"
+name = "ide-diagnostics"
 version = "0.0.0"
 dependencies = [
  "cfg",
@@ -689,29 +689,29 @@ dependencies = [
  "either",
  "expect-test",
  "hir",
- "ide_db",
+ "ide-db",
  "itertools",
  "profile",
  "sourcegen",
  "stdx",
  "syntax",
- "test_utils",
- "text_edit",
+ "test-utils",
+ "text-edit",
 ]
 
 [[package]]
-name = "ide_ssr"
+name = "ide-ssr"
 version = "0.0.0"
 dependencies = [
  "cov-mark",
  "expect-test",
  "hir",
- "ide_db",
+ "ide-db",
  "itertools",
  "parser",
  "syntax",
- "test_utils",
- "text_edit",
+ "test-utils",
+ "text-edit",
 ]
 
 [[package]]
@@ -913,7 +913,7 @@ dependencies = [
  "smallvec",
  "stdx",
  "syntax",
- "test_utils",
+ "test-utils",
  "tracing",
  "tt",
 ]
@@ -1180,16 +1180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
 
 [[package]]
-name = "proc-macro2"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
-dependencies = [
- "unicode-xid",
-]
-
-[[package]]
-name = "proc_macro_api"
+name = "proc-macro-api"
 version = "0.0.0"
 dependencies = [
  "memmap2",
@@ -1205,7 +1196,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "proc_macro_srv"
+name = "proc-macro-srv"
 version = "0.0.0"
 dependencies = [
  "expect-test",
@@ -1214,25 +1205,34 @@ dependencies = [
  "memmap2",
  "object 0.28.3",
  "paths",
- "proc_macro_api",
- "proc_macro_test",
+ "proc-macro-api",
+ "proc-macro-test",
  "tt",
 ]
 
 [[package]]
-name = "proc_macro_test"
+name = "proc-macro-test"
 version = "0.0.0"
 dependencies = [
  "cargo_metadata",
- "proc_macro_test_impl",
+ "proc-macro-test-impl",
  "toolchain",
 ]
 
 [[package]]
-name = "proc_macro_test_impl"
+name = "proc-macro-test-impl"
 version = "0.0.0"
 
 [[package]]
+name = "proc-macro2"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
 name = "profile"
 version = "0.0.0"
 dependencies = [
@@ -1247,11 +1247,11 @@ dependencies = [
 ]
 
 [[package]]
-name = "project_model"
+name = "project-model"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "base_db",
+ "base-db",
  "cargo_metadata",
  "cfg",
  "expect-test",
@@ -1378,11 +1378,11 @@ dependencies = [
  "expect-test",
  "flycheck",
  "hir",
- "hir_def",
- "hir_ty",
+ "hir-def",
+ "hir-ty",
  "ide",
- "ide_db",
- "ide_ssr",
+ "ide-db",
+ "ide-ssr",
  "itertools",
  "jod-thread",
  "lsp-server",
@@ -1392,10 +1392,10 @@ dependencies = [
  "num_cpus",
  "oorandom",
  "parking_lot 0.12.0",
- "proc_macro_api",
- "proc_macro_srv",
+ "proc-macro-api",
+ "proc-macro-srv",
  "profile",
- "project_model",
+ "project-model",
  "rayon",
  "rustc-hash",
  "serde",
@@ -1403,7 +1403,7 @@ dependencies = [
  "sourcegen",
  "stdx",
  "syntax",
- "test_utils",
+ "test-utils",
  "threadpool",
  "tikv-jemallocator",
  "toolchain",
@@ -1639,13 +1639,13 @@ dependencies = [
  "smol_str",
  "sourcegen",
  "stdx",
- "test_utils",
- "text_edit",
+ "test-utils",
+ "text-edit",
  "ungrammar",
 ]
 
 [[package]]
-name = "test_utils"
+name = "test-utils"
 version = "0.0.0"
 dependencies = [
  "dissimilar",
@@ -1656,13 +1656,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "text-size"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a"
-
-[[package]]
-name = "text_edit"
+name = "text-edit"
 version = "0.0.0"
 dependencies = [
  "itertools",
@@ -1670,6 +1664,12 @@ dependencies = [
 ]
 
 [[package]]
+name = "text-size"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a"
+
+[[package]]
 name = "thread_local"
 version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index 3f83041bec0..6b68ca82389 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 members = ["xtask/", "lib/*", "crates/*"]
-exclude = ["crates/proc_macro_test/imp"]
+exclude = ["crates/proc-macro-test/imp"]
 
 [profile.dev]
 # Disabling debug info speeds up builds a bunch,
diff --git a/crates/base_db/Cargo.toml b/crates/base-db/Cargo.toml
index 7ef82f6a342..f02a51ab6c4 100644
--- a/crates/base_db/Cargo.toml
+++ b/crates/base-db/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "base_db"
+name = "base-db"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
@@ -18,5 +18,5 @@ stdx = { path = "../stdx", version = "0.0.0" }
 cfg = { path = "../cfg", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
 tt = { path = "../tt", version = "0.0.0" }
-test_utils = { path = "../test_utils", version = "0.0.0" }
+test-utils = { path = "../test-utils", version = "0.0.0" }
 vfs = { path = "../vfs", version = "0.0.0" }
diff --git a/crates/base_db/src/change.rs b/crates/base-db/src/change.rs
index 7e645d0fa87..7e645d0fa87 100644
--- a/crates/base_db/src/change.rs
+++ b/crates/base-db/src/change.rs
diff --git a/crates/base_db/src/fixture.rs b/crates/base-db/src/fixture.rs
index daa0e3f6997..daa0e3f6997 100644
--- a/crates/base_db/src/fixture.rs
+++ b/crates/base-db/src/fixture.rs
diff --git a/crates/base_db/src/input.rs b/crates/base-db/src/input.rs
index 9fcaa4b06dd..9fcaa4b06dd 100644
--- a/crates/base_db/src/input.rs
+++ b/crates/base-db/src/input.rs
diff --git a/crates/base_db/src/lib.rs b/crates/base-db/src/lib.rs
index 2454698bb61..2454698bb61 100644
--- a/crates/base_db/src/lib.rs
+++ b/crates/base-db/src/lib.rs
diff --git a/crates/hir_def/Cargo.toml b/crates/hir-def/Cargo.toml
index 5863092839b..d369c3ed282 100644
--- a/crates/hir_def/Cargo.toml
+++ b/crates/hir-def/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "hir_def"
+name = "hir-def"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
@@ -29,15 +29,15 @@ arrayvec = "0.7.2"
 la-arena = { version = "0.3.0", path = "../../lib/arena" }
 
 stdx = { path = "../stdx", version = "0.0.0" }
-base_db = { path = "../base_db", version = "0.0.0" }
+base-db = { path = "../base-db", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
-hir_expand = { path = "../hir_expand", version = "0.0.0" }
+hir-expand = { path = "../hir-expand", version = "0.0.0" }
 mbe = { path = "../mbe", version = "0.0.0" }
 cfg = { path = "../cfg", version = "0.0.0" }
 tt = { path = "../tt", version = "0.0.0" }
 limit = { path = "../limit", version = "0.0.0" }
 
 [dev-dependencies]
-test_utils = { path = "../test_utils" }
+test-utils = { path = "../test-utils" }
 expect-test = "1.2.2"
diff --git a/crates/hir_def/src/adt.rs b/crates/hir-def/src/adt.rs
index 6ba70a2df67..6ba70a2df67 100644
--- a/crates/hir_def/src/adt.rs
+++ b/crates/hir-def/src/adt.rs
diff --git a/crates/hir_def/src/attr.rs b/crates/hir-def/src/attr.rs
index 11d3f48b94a..11d3f48b94a 100644
--- a/crates/hir_def/src/attr.rs
+++ b/crates/hir-def/src/attr.rs
diff --git a/crates/hir_def/src/body.rs b/crates/hir-def/src/body.rs
index 57dd3a3502f..57dd3a3502f 100644
--- a/crates/hir_def/src/body.rs
+++ b/crates/hir-def/src/body.rs
diff --git a/crates/hir_def/src/body/lower.rs b/crates/hir-def/src/body/lower.rs
index f0cb39ec362..f0cb39ec362 100644
--- a/crates/hir_def/src/body/lower.rs
+++ b/crates/hir-def/src/body/lower.rs
diff --git a/crates/hir_def/src/body/scope.rs b/crates/hir-def/src/body/scope.rs
index fc36f1ae526..fc36f1ae526 100644
--- a/crates/hir_def/src/body/scope.rs
+++ b/crates/hir-def/src/body/scope.rs
diff --git a/crates/hir_def/src/body/tests.rs b/crates/hir-def/src/body/tests.rs
index c9601f85527..c9601f85527 100644
--- a/crates/hir_def/src/body/tests.rs
+++ b/crates/hir-def/src/body/tests.rs
diff --git a/crates/hir_def/src/body/tests/block.rs b/crates/hir-def/src/body/tests/block.rs
index 07482128898..07482128898 100644
--- a/crates/hir_def/src/body/tests/block.rs
+++ b/crates/hir-def/src/body/tests/block.rs
diff --git a/crates/hir_def/src/builtin_attr.rs b/crates/hir-def/src/builtin_attr.rs
index 3f43111fb1d..3f43111fb1d 100644
--- a/crates/hir_def/src/builtin_attr.rs
+++ b/crates/hir-def/src/builtin_attr.rs
diff --git a/crates/hir_def/src/builtin_type.rs b/crates/hir-def/src/builtin_type.rs
index 25a408036ff..25a408036ff 100644
--- a/crates/hir_def/src/builtin_type.rs
+++ b/crates/hir-def/src/builtin_type.rs
diff --git a/crates/hir_def/src/child_by_source.rs b/crates/hir-def/src/child_by_source.rs
index b1337ecc242..b1337ecc242 100644
--- a/crates/hir_def/src/child_by_source.rs
+++ b/crates/hir-def/src/child_by_source.rs
diff --git a/crates/hir_def/src/data.rs b/crates/hir-def/src/data.rs
index 3ef10297241..3ef10297241 100644
--- a/crates/hir_def/src/data.rs
+++ b/crates/hir-def/src/data.rs
diff --git a/crates/hir_def/src/db.rs b/crates/hir-def/src/db.rs
index df6dcb024b5..df6dcb024b5 100644
--- a/crates/hir_def/src/db.rs
+++ b/crates/hir-def/src/db.rs
diff --git a/crates/hir_def/src/dyn_map.rs b/crates/hir-def/src/dyn_map.rs
index 166aa04da04..166aa04da04 100644
--- a/crates/hir_def/src/dyn_map.rs
+++ b/crates/hir-def/src/dyn_map.rs
diff --git a/crates/hir_def/src/expr.rs b/crates/hir-def/src/expr.rs
index 4dca8238880..4dca8238880 100644
--- a/crates/hir_def/src/expr.rs
+++ b/crates/hir-def/src/expr.rs
diff --git a/crates/hir_def/src/find_path.rs b/crates/hir-def/src/find_path.rs
index 89e961f84fa..89e961f84fa 100644
--- a/crates/hir_def/src/find_path.rs
+++ b/crates/hir-def/src/find_path.rs
diff --git a/crates/hir_def/src/generics.rs b/crates/hir-def/src/generics.rs
index 04b77894ae9..04b77894ae9 100644
--- a/crates/hir_def/src/generics.rs
+++ b/crates/hir-def/src/generics.rs
diff --git a/crates/hir_def/src/import_map.rs b/crates/hir-def/src/import_map.rs
index 000fe5ac7bb..000fe5ac7bb 100644
--- a/crates/hir_def/src/import_map.rs
+++ b/crates/hir-def/src/import_map.rs
diff --git a/crates/hir_def/src/intern.rs b/crates/hir-def/src/intern.rs
index f5a4f5ec4e3..f5a4f5ec4e3 100644
--- a/crates/hir_def/src/intern.rs
+++ b/crates/hir-def/src/intern.rs
diff --git a/crates/hir_def/src/item_scope.rs b/crates/hir-def/src/item_scope.rs
index ddccbbfef9c..ddccbbfef9c 100644
--- a/crates/hir_def/src/item_scope.rs
+++ b/crates/hir-def/src/item_scope.rs
diff --git a/crates/hir_def/src/item_tree.rs b/crates/hir-def/src/item_tree.rs
index 375587ee935..375587ee935 100644
--- a/crates/hir_def/src/item_tree.rs
+++ b/crates/hir-def/src/item_tree.rs
diff --git a/crates/hir_def/src/item_tree/lower.rs b/crates/hir-def/src/item_tree/lower.rs
index cdae0d0803b..cdae0d0803b 100644
--- a/crates/hir_def/src/item_tree/lower.rs
+++ b/crates/hir-def/src/item_tree/lower.rs
diff --git a/crates/hir_def/src/item_tree/pretty.rs b/crates/hir-def/src/item_tree/pretty.rs
index f12d9a1273c..f12d9a1273c 100644
--- a/crates/hir_def/src/item_tree/pretty.rs
+++ b/crates/hir-def/src/item_tree/pretty.rs
diff --git a/crates/hir_def/src/item_tree/tests.rs b/crates/hir-def/src/item_tree/tests.rs
index fb3811dbd56..fb3811dbd56 100644
--- a/crates/hir_def/src/item_tree/tests.rs
+++ b/crates/hir-def/src/item_tree/tests.rs
diff --git a/crates/hir_def/src/keys.rs b/crates/hir-def/src/keys.rs
index c5cb9a2af53..c5cb9a2af53 100644
--- a/crates/hir_def/src/keys.rs
+++ b/crates/hir-def/src/keys.rs
diff --git a/crates/hir_def/src/lang_item.rs b/crates/hir-def/src/lang_item.rs
index 87785018458..87785018458 100644
--- a/crates/hir_def/src/lang_item.rs
+++ b/crates/hir-def/src/lang_item.rs
diff --git a/crates/hir_def/src/lib.rs b/crates/hir-def/src/lib.rs
index 974a2ab8f25..974a2ab8f25 100644
--- a/crates/hir_def/src/lib.rs
+++ b/crates/hir-def/src/lib.rs
diff --git a/crates/hir_def/src/macro_expansion_tests.rs b/crates/hir-def/src/macro_expansion_tests.rs
index 9d9b925bd2d..9d9b925bd2d 100644
--- a/crates/hir_def/src/macro_expansion_tests.rs
+++ b/crates/hir-def/src/macro_expansion_tests.rs
diff --git a/crates/hir_def/src/macro_expansion_tests/builtin_derive_macro.rs b/crates/hir-def/src/macro_expansion_tests/builtin_derive_macro.rs
index 8ee33101e4d..8ee33101e4d 100644
--- a/crates/hir_def/src/macro_expansion_tests/builtin_derive_macro.rs
+++ b/crates/hir-def/src/macro_expansion_tests/builtin_derive_macro.rs
diff --git a/crates/hir_def/src/macro_expansion_tests/builtin_fn_macro.rs b/crates/hir-def/src/macro_expansion_tests/builtin_fn_macro.rs
index a28478ff4d8..a28478ff4d8 100644
--- a/crates/hir_def/src/macro_expansion_tests/builtin_fn_macro.rs
+++ b/crates/hir-def/src/macro_expansion_tests/builtin_fn_macro.rs
diff --git a/crates/hir_def/src/macro_expansion_tests/mbe.rs b/crates/hir-def/src/macro_expansion_tests/mbe.rs
index c8c7b19acaa..c8c7b19acaa 100644
--- a/crates/hir_def/src/macro_expansion_tests/mbe.rs
+++ b/crates/hir-def/src/macro_expansion_tests/mbe.rs
diff --git a/crates/hir_def/src/macro_expansion_tests/mbe/matching.rs b/crates/hir-def/src/macro_expansion_tests/mbe/matching.rs
index bc162d0fa20..bc162d0fa20 100644
--- a/crates/hir_def/src/macro_expansion_tests/mbe/matching.rs
+++ b/crates/hir-def/src/macro_expansion_tests/mbe/matching.rs
diff --git a/crates/hir_def/src/macro_expansion_tests/mbe/meta_syntax.rs b/crates/hir-def/src/macro_expansion_tests/mbe/meta_syntax.rs
index 2de10ddbdf9..2de10ddbdf9 100644
--- a/crates/hir_def/src/macro_expansion_tests/mbe/meta_syntax.rs
+++ b/crates/hir-def/src/macro_expansion_tests/mbe/meta_syntax.rs
diff --git a/crates/hir_def/src/macro_expansion_tests/mbe/regression.rs b/crates/hir-def/src/macro_expansion_tests/mbe/regression.rs
index 2dff4adf2ee..2dff4adf2ee 100644
--- a/crates/hir_def/src/macro_expansion_tests/mbe/regression.rs
+++ b/crates/hir-def/src/macro_expansion_tests/mbe/regression.rs
diff --git a/crates/hir_def/src/macro_expansion_tests/mbe/tt_conversion.rs b/crates/hir-def/src/macro_expansion_tests/mbe/tt_conversion.rs
index 84cc3f3872f..84cc3f3872f 100644
--- a/crates/hir_def/src/macro_expansion_tests/mbe/tt_conversion.rs
+++ b/crates/hir-def/src/macro_expansion_tests/mbe/tt_conversion.rs
diff --git a/crates/hir_def/src/macro_expansion_tests/proc_macros.rs b/crates/hir-def/src/macro_expansion_tests/proc_macros.rs
index 0ca30fb7992..0ca30fb7992 100644
--- a/crates/hir_def/src/macro_expansion_tests/proc_macros.rs
+++ b/crates/hir-def/src/macro_expansion_tests/proc_macros.rs
diff --git a/crates/hir_def/src/nameres.rs b/crates/hir-def/src/nameres.rs
index e923d883ecf..e923d883ecf 100644
--- a/crates/hir_def/src/nameres.rs
+++ b/crates/hir-def/src/nameres.rs
diff --git a/crates/hir_def/src/nameres/attr_resolution.rs b/crates/hir-def/src/nameres/attr_resolution.rs
index 3650204ee9d..3650204ee9d 100644
--- a/crates/hir_def/src/nameres/attr_resolution.rs
+++ b/crates/hir-def/src/nameres/attr_resolution.rs
diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir-def/src/nameres/collector.rs
index a9705cf2dce..a9705cf2dce 100644
--- a/crates/hir_def/src/nameres/collector.rs
+++ b/crates/hir-def/src/nameres/collector.rs
diff --git a/crates/hir_def/src/nameres/diagnostics.rs b/crates/hir-def/src/nameres/diagnostics.rs
index dd3ff92cb3b..dd3ff92cb3b 100644
--- a/crates/hir_def/src/nameres/diagnostics.rs
+++ b/crates/hir-def/src/nameres/diagnostics.rs
diff --git a/crates/hir_def/src/nameres/mod_resolution.rs b/crates/hir-def/src/nameres/mod_resolution.rs
index 52a620fe22f..52a620fe22f 100644
--- a/crates/hir_def/src/nameres/mod_resolution.rs
+++ b/crates/hir-def/src/nameres/mod_resolution.rs
diff --git a/crates/hir_def/src/nameres/path_resolution.rs b/crates/hir-def/src/nameres/path_resolution.rs
index cc5fc0a52a1..cc5fc0a52a1 100644
--- a/crates/hir_def/src/nameres/path_resolution.rs
+++ b/crates/hir-def/src/nameres/path_resolution.rs
diff --git a/crates/hir_def/src/nameres/proc_macro.rs b/crates/hir-def/src/nameres/proc_macro.rs
index 5089ef2d817..5089ef2d817 100644
--- a/crates/hir_def/src/nameres/proc_macro.rs
+++ b/crates/hir-def/src/nameres/proc_macro.rs
diff --git a/crates/hir_def/src/nameres/tests.rs b/crates/hir-def/src/nameres/tests.rs
index 80e54760714..80e54760714 100644
--- a/crates/hir_def/src/nameres/tests.rs
+++ b/crates/hir-def/src/nameres/tests.rs
diff --git a/crates/hir_def/src/nameres/tests/globs.rs b/crates/hir-def/src/nameres/tests/globs.rs
index 17426d54d40..17426d54d40 100644
--- a/crates/hir_def/src/nameres/tests/globs.rs
+++ b/crates/hir-def/src/nameres/tests/globs.rs
diff --git a/crates/hir_def/src/nameres/tests/incremental.rs b/crates/hir-def/src/nameres/tests/incremental.rs
index 2e8cb3621fc..2e8cb3621fc 100644
--- a/crates/hir_def/src/nameres/tests/incremental.rs
+++ b/crates/hir-def/src/nameres/tests/incremental.rs
diff --git a/crates/hir_def/src/nameres/tests/macros.rs b/crates/hir-def/src/nameres/tests/macros.rs
index 411840ccbcc..411840ccbcc 100644
--- a/crates/hir_def/src/nameres/tests/macros.rs
+++ b/crates/hir-def/src/nameres/tests/macros.rs
diff --git a/crates/hir_def/src/nameres/tests/mod_resolution.rs b/crates/hir-def/src/nameres/tests/mod_resolution.rs
index 79a74873b4a..79a74873b4a 100644
--- a/crates/hir_def/src/nameres/tests/mod_resolution.rs
+++ b/crates/hir-def/src/nameres/tests/mod_resolution.rs
diff --git a/crates/hir_def/src/nameres/tests/primitives.rs b/crates/hir-def/src/nameres/tests/primitives.rs
index 215e8952d90..215e8952d90 100644
--- a/crates/hir_def/src/nameres/tests/primitives.rs
+++ b/crates/hir-def/src/nameres/tests/primitives.rs
diff --git a/crates/hir_def/src/path.rs b/crates/hir-def/src/path.rs
index 37c09a09845..37c09a09845 100644
--- a/crates/hir_def/src/path.rs
+++ b/crates/hir-def/src/path.rs
diff --git a/crates/hir_def/src/path/lower.rs b/crates/hir-def/src/path/lower.rs
index b6a24cd4ab1..b6a24cd4ab1 100644
--- a/crates/hir_def/src/path/lower.rs
+++ b/crates/hir-def/src/path/lower.rs
diff --git a/crates/hir_def/src/per_ns.rs b/crates/hir-def/src/per_ns.rs
index bf5bf10c4ca..bf5bf10c4ca 100644
--- a/crates/hir_def/src/per_ns.rs
+++ b/crates/hir-def/src/per_ns.rs
diff --git a/crates/hir_def/src/resolver.rs b/crates/hir-def/src/resolver.rs
index f3dcdcfa4a1..f3dcdcfa4a1 100644
--- a/crates/hir_def/src/resolver.rs
+++ b/crates/hir-def/src/resolver.rs
diff --git a/crates/hir_def/src/src.rs b/crates/hir-def/src/src.rs
index f69356cac87..f69356cac87 100644
--- a/crates/hir_def/src/src.rs
+++ b/crates/hir-def/src/src.rs
diff --git a/crates/hir_def/src/test_db.rs b/crates/hir-def/src/test_db.rs
index baf71731f49..baf71731f49 100644
--- a/crates/hir_def/src/test_db.rs
+++ b/crates/hir-def/src/test_db.rs
diff --git a/crates/hir_def/src/trace.rs b/crates/hir-def/src/trace.rs
index 6e6ceb8e474..6e6ceb8e474 100644
--- a/crates/hir_def/src/trace.rs
+++ b/crates/hir-def/src/trace.rs
diff --git a/crates/hir_def/src/type_ref.rs b/crates/hir-def/src/type_ref.rs
index 8e9336a0cc4..8e9336a0cc4 100644
--- a/crates/hir_def/src/type_ref.rs
+++ b/crates/hir-def/src/type_ref.rs
diff --git a/crates/hir_def/src/visibility.rs b/crates/hir-def/src/visibility.rs
index 6e22a877a9f..6e22a877a9f 100644
--- a/crates/hir_def/src/visibility.rs
+++ b/crates/hir-def/src/visibility.rs
diff --git a/crates/hir_expand/Cargo.toml b/crates/hir-expand/Cargo.toml
index 9d8772d1293..f4770a6f9fe 100644
--- a/crates/hir_expand/Cargo.toml
+++ b/crates/hir-expand/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "hir_expand"
+name = "hir-expand"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
@@ -20,7 +20,7 @@ hashbrown = { version = "0.12.0", features = [
     "inline-more",
 ], default-features = false }
 
-base_db = { path = "../base_db", version = "0.0.0" }
+base-db = { path = "../base-db", version = "0.0.0" }
 cfg = { path = "../cfg", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
diff --git a/crates/hir_expand/src/ast_id_map.rs b/crates/hir-expand/src/ast_id_map.rs
index c1ddef03ba3..c1ddef03ba3 100644
--- a/crates/hir_expand/src/ast_id_map.rs
+++ b/crates/hir-expand/src/ast_id_map.rs
diff --git a/crates/hir_expand/src/builtin_attr_macro.rs b/crates/hir-expand/src/builtin_attr_macro.rs
index 0c886ac4da9..0c886ac4da9 100644
--- a/crates/hir_expand/src/builtin_attr_macro.rs
+++ b/crates/hir-expand/src/builtin_attr_macro.rs
diff --git a/crates/hir_expand/src/builtin_derive_macro.rs b/crates/hir-expand/src/builtin_derive_macro.rs
index f7d5532df5e..f7d5532df5e 100644
--- a/crates/hir_expand/src/builtin_derive_macro.rs
+++ b/crates/hir-expand/src/builtin_derive_macro.rs
diff --git a/crates/hir_expand/src/builtin_fn_macro.rs b/crates/hir-expand/src/builtin_fn_macro.rs
index 8d2352f06ed..8d2352f06ed 100644
--- a/crates/hir_expand/src/builtin_fn_macro.rs
+++ b/crates/hir-expand/src/builtin_fn_macro.rs
diff --git a/crates/hir_expand/src/db.rs b/crates/hir-expand/src/db.rs
index 8c08fdcd2ea..8c08fdcd2ea 100644
--- a/crates/hir_expand/src/db.rs
+++ b/crates/hir-expand/src/db.rs
diff --git a/crates/hir_expand/src/eager.rs b/crates/hir-expand/src/eager.rs
index 5fd099aea7d..5fd099aea7d 100644
--- a/crates/hir_expand/src/eager.rs
+++ b/crates/hir-expand/src/eager.rs
diff --git a/crates/hir_expand/src/fixup.rs b/crates/hir-expand/src/fixup.rs
index c924478cecb..c924478cecb 100644
--- a/crates/hir_expand/src/fixup.rs
+++ b/crates/hir-expand/src/fixup.rs
diff --git a/crates/hir_expand/src/hygiene.rs b/crates/hir-expand/src/hygiene.rs
index d60734372c0..d60734372c0 100644
--- a/crates/hir_expand/src/hygiene.rs
+++ b/crates/hir-expand/src/hygiene.rs
diff --git a/crates/hir_expand/src/lib.rs b/crates/hir-expand/src/lib.rs
index bc5372754d6..bc5372754d6 100644
--- a/crates/hir_expand/src/lib.rs
+++ b/crates/hir-expand/src/lib.rs
diff --git a/crates/hir_expand/src/mod_path.rs b/crates/hir-expand/src/mod_path.rs
index bb2f6350c67..bb2f6350c67 100644
--- a/crates/hir_expand/src/mod_path.rs
+++ b/crates/hir-expand/src/mod_path.rs
diff --git a/crates/hir_expand/src/name.rs b/crates/hir-expand/src/name.rs
index f1bf6657079..f1bf6657079 100644
--- a/crates/hir_expand/src/name.rs
+++ b/crates/hir-expand/src/name.rs
diff --git a/crates/hir_expand/src/proc_macro.rs b/crates/hir-expand/src/proc_macro.rs
index df6c38761c3..df6c38761c3 100644
--- a/crates/hir_expand/src/proc_macro.rs
+++ b/crates/hir-expand/src/proc_macro.rs
diff --git a/crates/hir_expand/src/quote.rs b/crates/hir-expand/src/quote.rs
index 82f410ecda9..82f410ecda9 100644
--- a/crates/hir_expand/src/quote.rs
+++ b/crates/hir-expand/src/quote.rs
diff --git a/crates/hir_ty/Cargo.toml b/crates/hir-ty/Cargo.toml
index 1fe57882539..06cdb1e4e03 100644
--- a/crates/hir_ty/Cargo.toml
+++ b/crates/hir-ty/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "hir_ty"
+name = "hir-ty"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
@@ -26,15 +26,15 @@ once_cell = "1.10.0"
 typed-arena = "2.0.1"
 
 stdx = { path = "../stdx", version = "0.0.0" }
-hir_def = { path = "../hir_def", version = "0.0.0" }
-hir_expand = { path = "../hir_expand", version = "0.0.0" }
-base_db = { path = "../base_db", version = "0.0.0" }
+hir-def = { path = "../hir-def", version = "0.0.0" }
+hir-expand = { path = "../hir-expand", version = "0.0.0" }
+base-db = { path = "../base-db", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
 limit = { path = "../limit", version = "0.0.0" }
 
 [dev-dependencies]
-test_utils = { path = "../test_utils" }
+test-utils = { path = "../test-utils" }
 expect-test = "1.2.2"
 tracing = "0.1.32"
 tracing-subscriber = { version = "0.3.9", default-features = false, features = [
diff --git a/crates/hir_ty/src/autoderef.rs b/crates/hir-ty/src/autoderef.rs
index 22cb856535e..22cb856535e 100644
--- a/crates/hir_ty/src/autoderef.rs
+++ b/crates/hir-ty/src/autoderef.rs
diff --git a/crates/hir_ty/src/builder.rs b/crates/hir-ty/src/builder.rs
index 8c47e9ce1cb..8c47e9ce1cb 100644
--- a/crates/hir_ty/src/builder.rs
+++ b/crates/hir-ty/src/builder.rs
diff --git a/crates/hir_ty/src/chalk_db.rs b/crates/hir-ty/src/chalk_db.rs
index 6972db84956..6972db84956 100644
--- a/crates/hir_ty/src/chalk_db.rs
+++ b/crates/hir-ty/src/chalk_db.rs
diff --git a/crates/hir_ty/src/chalk_ext.rs b/crates/hir-ty/src/chalk_ext.rs
index b0885ab003f..b0885ab003f 100644
--- a/crates/hir_ty/src/chalk_ext.rs
+++ b/crates/hir-ty/src/chalk_ext.rs
diff --git a/crates/hir_ty/src/consteval.rs b/crates/hir-ty/src/consteval.rs
index 4b58262dace..4b58262dace 100644
--- a/crates/hir_ty/src/consteval.rs
+++ b/crates/hir-ty/src/consteval.rs
diff --git a/crates/hir_ty/src/consteval/tests.rs b/crates/hir-ty/src/consteval/tests.rs
index 4a052851afd..4a052851afd 100644
--- a/crates/hir_ty/src/consteval/tests.rs
+++ b/crates/hir-ty/src/consteval/tests.rs
diff --git a/crates/hir_ty/src/db.rs b/crates/hir-ty/src/db.rs
index de4c1535902..de4c1535902 100644
--- a/crates/hir_ty/src/db.rs
+++ b/crates/hir-ty/src/db.rs
diff --git a/crates/hir_ty/src/diagnostics.rs b/crates/hir-ty/src/diagnostics.rs
index 37eb06be1d3..37eb06be1d3 100644
--- a/crates/hir_ty/src/diagnostics.rs
+++ b/crates/hir-ty/src/diagnostics.rs
diff --git a/crates/hir_ty/src/diagnostics/decl_check.rs b/crates/hir-ty/src/diagnostics/decl_check.rs
index f7031a8546a..f7031a8546a 100644
--- a/crates/hir_ty/src/diagnostics/decl_check.rs
+++ b/crates/hir-ty/src/diagnostics/decl_check.rs
diff --git a/crates/hir_ty/src/diagnostics/decl_check/case_conv.rs b/crates/hir-ty/src/diagnostics/decl_check/case_conv.rs
index 88d607194f7..88d607194f7 100644
--- a/crates/hir_ty/src/diagnostics/decl_check/case_conv.rs
+++ b/crates/hir-ty/src/diagnostics/decl_check/case_conv.rs
diff --git a/crates/hir_ty/src/diagnostics/expr.rs b/crates/hir-ty/src/diagnostics/expr.rs
index 335d95c0cf2..335d95c0cf2 100644
--- a/crates/hir_ty/src/diagnostics/expr.rs
+++ b/crates/hir-ty/src/diagnostics/expr.rs
diff --git a/crates/hir_ty/src/diagnostics/match_check.rs b/crates/hir-ty/src/diagnostics/match_check.rs
index d21ea32d9e4..d21ea32d9e4 100644
--- a/crates/hir_ty/src/diagnostics/match_check.rs
+++ b/crates/hir-ty/src/diagnostics/match_check.rs
diff --git a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs b/crates/hir-ty/src/diagnostics/match_check/deconstruct_pat.rs
index 84ded517ba7..84ded517ba7 100644
--- a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs
+++ b/crates/hir-ty/src/diagnostics/match_check/deconstruct_pat.rs
diff --git a/crates/hir_ty/src/diagnostics/match_check/pat_util.rs b/crates/hir-ty/src/diagnostics/match_check/pat_util.rs
index b89b4f2bfb7..b89b4f2bfb7 100644
--- a/crates/hir_ty/src/diagnostics/match_check/pat_util.rs
+++ b/crates/hir-ty/src/diagnostics/match_check/pat_util.rs
diff --git a/crates/hir_ty/src/diagnostics/match_check/usefulness.rs b/crates/hir-ty/src/diagnostics/match_check/usefulness.rs
index e8a13955d21..e8a13955d21 100644
--- a/crates/hir_ty/src/diagnostics/match_check/usefulness.rs
+++ b/crates/hir-ty/src/diagnostics/match_check/usefulness.rs
diff --git a/crates/hir_ty/src/diagnostics/unsafe_check.rs b/crates/hir-ty/src/diagnostics/unsafe_check.rs
index 161b19a739c..161b19a739c 100644
--- a/crates/hir_ty/src/diagnostics/unsafe_check.rs
+++ b/crates/hir-ty/src/diagnostics/unsafe_check.rs
diff --git a/crates/hir_ty/src/display.rs b/crates/hir-ty/src/display.rs
index 2609a607945..2609a607945 100644
--- a/crates/hir_ty/src/display.rs
+++ b/crates/hir-ty/src/display.rs
diff --git a/crates/hir_ty/src/infer.rs b/crates/hir-ty/src/infer.rs
index 7f5ad415096..7f5ad415096 100644
--- a/crates/hir_ty/src/infer.rs
+++ b/crates/hir-ty/src/infer.rs
diff --git a/crates/hir_ty/src/infer/closure.rs b/crates/hir-ty/src/infer/closure.rs
index 3ead929098b..3ead929098b 100644
--- a/crates/hir_ty/src/infer/closure.rs
+++ b/crates/hir-ty/src/infer/closure.rs
diff --git a/crates/hir_ty/src/infer/coerce.rs b/crates/hir-ty/src/infer/coerce.rs
index f54440bf5b3..f54440bf5b3 100644
--- a/crates/hir_ty/src/infer/coerce.rs
+++ b/crates/hir-ty/src/infer/coerce.rs
diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir-ty/src/infer/expr.rs
index fef02e63b70..fef02e63b70 100644
--- a/crates/hir_ty/src/infer/expr.rs
+++ b/crates/hir-ty/src/infer/expr.rs
diff --git a/crates/hir_ty/src/infer/pat.rs b/crates/hir-ty/src/infer/pat.rs
index 600b82ca414..600b82ca414 100644
--- a/crates/hir_ty/src/infer/pat.rs
+++ b/crates/hir-ty/src/infer/pat.rs
diff --git a/crates/hir_ty/src/infer/path.rs b/crates/hir-ty/src/infer/path.rs
index f580e09e912..f580e09e912 100644
--- a/crates/hir_ty/src/infer/path.rs
+++ b/crates/hir-ty/src/infer/path.rs
diff --git a/crates/hir_ty/src/infer/unify.rs b/crates/hir-ty/src/infer/unify.rs
index 84ca1660afb..84ca1660afb 100644
--- a/crates/hir_ty/src/infer/unify.rs
+++ b/crates/hir-ty/src/infer/unify.rs
diff --git a/crates/hir_ty/src/interner.rs b/crates/hir-ty/src/interner.rs
index 07197d8a190..07197d8a190 100644
--- a/crates/hir_ty/src/interner.rs
+++ b/crates/hir-ty/src/interner.rs
diff --git a/crates/hir_ty/src/lib.rs b/crates/hir-ty/src/lib.rs
index 85d8ccc0772..85d8ccc0772 100644
--- a/crates/hir_ty/src/lib.rs
+++ b/crates/hir-ty/src/lib.rs
diff --git a/crates/hir_ty/src/lower.rs b/crates/hir-ty/src/lower.rs
index a3787728eac..a3787728eac 100644
--- a/crates/hir_ty/src/lower.rs
+++ b/crates/hir-ty/src/lower.rs
diff --git a/crates/hir_ty/src/mapping.rs b/crates/hir-ty/src/mapping.rs
index d765fee0e1f..d765fee0e1f 100644
--- a/crates/hir_ty/src/mapping.rs
+++ b/crates/hir-ty/src/mapping.rs
diff --git a/crates/hir_ty/src/method_resolution.rs b/crates/hir-ty/src/method_resolution.rs
index d5285c17106..d5285c17106 100644
--- a/crates/hir_ty/src/method_resolution.rs
+++ b/crates/hir-ty/src/method_resolution.rs
diff --git a/crates/hir_ty/src/primitive.rs b/crates/hir-ty/src/primitive.rs
index d7f48c69a56..d7f48c69a56 100644
--- a/crates/hir_ty/src/primitive.rs
+++ b/crates/hir-ty/src/primitive.rs
diff --git a/crates/hir_ty/src/test_db.rs b/crates/hir-ty/src/test_db.rs
index ee6c2fa4f8c..ee6c2fa4f8c 100644
--- a/crates/hir_ty/src/test_db.rs
+++ b/crates/hir-ty/src/test_db.rs
diff --git a/crates/hir_ty/src/tests.rs b/crates/hir-ty/src/tests.rs
index d2f13e4351c..d2f13e4351c 100644
--- a/crates/hir_ty/src/tests.rs
+++ b/crates/hir-ty/src/tests.rs
diff --git a/crates/hir_ty/src/tests/coercion.rs b/crates/hir-ty/src/tests/coercion.rs
index 268faf8cb3a..268faf8cb3a 100644
--- a/crates/hir_ty/src/tests/coercion.rs
+++ b/crates/hir-ty/src/tests/coercion.rs
diff --git a/crates/hir_ty/src/tests/diagnostics.rs b/crates/hir-ty/src/tests/diagnostics.rs
index f00fa972948..f00fa972948 100644
--- a/crates/hir_ty/src/tests/diagnostics.rs
+++ b/crates/hir-ty/src/tests/diagnostics.rs
diff --git a/crates/hir_ty/src/tests/display_source_code.rs b/crates/hir-ty/src/tests/display_source_code.rs
index 240942e488d..240942e488d 100644
--- a/crates/hir_ty/src/tests/display_source_code.rs
+++ b/crates/hir-ty/src/tests/display_source_code.rs
diff --git a/crates/hir_ty/src/tests/incremental.rs b/crates/hir-ty/src/tests/incremental.rs
index 3e08e83e89a..3e08e83e89a 100644
--- a/crates/hir_ty/src/tests/incremental.rs
+++ b/crates/hir-ty/src/tests/incremental.rs
diff --git a/crates/hir_ty/src/tests/macros.rs b/crates/hir-ty/src/tests/macros.rs
index a61175f2733..a61175f2733 100644
--- a/crates/hir_ty/src/tests/macros.rs
+++ b/crates/hir-ty/src/tests/macros.rs
diff --git a/crates/hir_ty/src/tests/method_resolution.rs b/crates/hir-ty/src/tests/method_resolution.rs
index 68463dc068b..68463dc068b 100644
--- a/crates/hir_ty/src/tests/method_resolution.rs
+++ b/crates/hir-ty/src/tests/method_resolution.rs
diff --git a/crates/hir_ty/src/tests/never_type.rs b/crates/hir-ty/src/tests/never_type.rs
index fbdc8209f8f..fbdc8209f8f 100644
--- a/crates/hir_ty/src/tests/never_type.rs
+++ b/crates/hir-ty/src/tests/never_type.rs
diff --git a/crates/hir_ty/src/tests/patterns.rs b/crates/hir-ty/src/tests/patterns.rs
index acdd8f50efb..acdd8f50efb 100644
--- a/crates/hir_ty/src/tests/patterns.rs
+++ b/crates/hir-ty/src/tests/patterns.rs
diff --git a/crates/hir_ty/src/tests/regression.rs b/crates/hir-ty/src/tests/regression.rs
index ef27667ffa5..ef27667ffa5 100644
--- a/crates/hir_ty/src/tests/regression.rs
+++ b/crates/hir-ty/src/tests/regression.rs
diff --git a/crates/hir_ty/src/tests/simple.rs b/crates/hir-ty/src/tests/simple.rs
index d4d61c2167c..d4d61c2167c 100644
--- a/crates/hir_ty/src/tests/simple.rs
+++ b/crates/hir-ty/src/tests/simple.rs
diff --git a/crates/hir_ty/src/tests/traits.rs b/crates/hir-ty/src/tests/traits.rs
index 5e58d5ad838..5e58d5ad838 100644
--- a/crates/hir_ty/src/tests/traits.rs
+++ b/crates/hir-ty/src/tests/traits.rs
diff --git a/crates/hir_ty/src/tls.rs b/crates/hir-ty/src/tls.rs
index 0600fd7c6d9..0600fd7c6d9 100644
--- a/crates/hir_ty/src/tls.rs
+++ b/crates/hir-ty/src/tls.rs
diff --git a/crates/hir_ty/src/traits.rs b/crates/hir-ty/src/traits.rs
index b139edbee94..b139edbee94 100644
--- a/crates/hir_ty/src/traits.rs
+++ b/crates/hir-ty/src/traits.rs
diff --git a/crates/hir_ty/src/utils.rs b/crates/hir-ty/src/utils.rs
index bdb7677f5d7..bdb7677f5d7 100644
--- a/crates/hir_ty/src/utils.rs
+++ b/crates/hir-ty/src/utils.rs
diff --git a/crates/hir_ty/src/walk.rs b/crates/hir-ty/src/walk.rs
index c476894552e..c476894552e 100644
--- a/crates/hir_ty/src/walk.rs
+++ b/crates/hir-ty/src/walk.rs
diff --git a/crates/hir/Cargo.toml b/crates/hir/Cargo.toml
index 2b9a52d36fe..1cffd823f26 100644
--- a/crates/hir/Cargo.toml
+++ b/crates/hir/Cargo.toml
@@ -19,10 +19,10 @@ once_cell = "1.10.0"
 
 stdx = { path = "../stdx", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
-base_db = { path = "../base_db", version = "0.0.0" }
+base-db = { path = "../base-db", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
-hir_expand = { path = "../hir_expand", version = "0.0.0" }
-hir_def = { path = "../hir_def", version = "0.0.0" }
-hir_ty = { path = "../hir_ty", version = "0.0.0" }
+hir-expand = { path = "../hir-expand", version = "0.0.0" }
+hir-def = { path = "../hir-def", version = "0.0.0" }
+hir-ty = { path = "../hir-ty", version = "0.0.0" }
 tt = { path = "../tt", version = "0.0.0" }
 cfg = { path = "../cfg", version = "0.0.0" }
diff --git a/crates/ide_assists/Cargo.toml b/crates/ide-assists/Cargo.toml
index edd0d262909..d86de2cca4b 100644
--- a/crates/ide_assists/Cargo.toml
+++ b/crates/ide-assists/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ide_assists"
+name = "ide-assists"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
@@ -17,12 +17,12 @@ either = "1.6.1"
 
 stdx = { path = "../stdx", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
-text_edit = { path = "../text_edit", version = "0.0.0" }
+text-edit = { path = "../text-edit", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
-ide_db = { path = "../ide_db", version = "0.0.0" }
+ide-db = { path = "../ide-db", version = "0.0.0" }
 hir = { path = "../hir", version = "0.0.0" }
 
 [dev-dependencies]
-test_utils = { path = "../test_utils" }
+test-utils = { path = "../test-utils" }
 sourcegen = { path = "../sourcegen" }
 expect-test = "1.2.2"
diff --git a/crates/ide_assists/src/assist_config.rs b/crates/ide-assists/src/assist_config.rs
index d4d148c7745..d4d148c7745 100644
--- a/crates/ide_assists/src/assist_config.rs
+++ b/crates/ide-assists/src/assist_config.rs
diff --git a/crates/ide_assists/src/assist_context.rs b/crates/ide-assists/src/assist_context.rs
index ec85faaf46d..ec85faaf46d 100644
--- a/crates/ide_assists/src/assist_context.rs
+++ b/crates/ide-assists/src/assist_context.rs
diff --git a/crates/ide_assists/src/handlers/add_explicit_type.rs b/crates/ide-assists/src/handlers/add_explicit_type.rs
index 6b7db739c80..6b7db739c80 100644
--- a/crates/ide_assists/src/handlers/add_explicit_type.rs
+++ b/crates/ide-assists/src/handlers/add_explicit_type.rs
diff --git a/crates/ide_assists/src/handlers/add_lifetime_to_type.rs b/crates/ide-assists/src/handlers/add_lifetime_to_type.rs
index 14cdc1cf869..14cdc1cf869 100644
--- a/crates/ide_assists/src/handlers/add_lifetime_to_type.rs
+++ b/crates/ide-assists/src/handlers/add_lifetime_to_type.rs
diff --git a/crates/ide_assists/src/handlers/add_missing_impl_members.rs b/crates/ide-assists/src/handlers/add_missing_impl_members.rs
index 6e700695fb4..6e700695fb4 100644
--- a/crates/ide_assists/src/handlers/add_missing_impl_members.rs
+++ b/crates/ide-assists/src/handlers/add_missing_impl_members.rs
diff --git a/crates/ide_assists/src/handlers/add_missing_match_arms.rs b/crates/ide-assists/src/handlers/add_missing_match_arms.rs
index 171b3f44326..171b3f44326 100644
--- a/crates/ide_assists/src/handlers/add_missing_match_arms.rs
+++ b/crates/ide-assists/src/handlers/add_missing_match_arms.rs
diff --git a/crates/ide_assists/src/handlers/add_return_type.rs b/crates/ide-assists/src/handlers/add_return_type.rs
index 42a5b8b672f..42a5b8b672f 100644
--- a/crates/ide_assists/src/handlers/add_return_type.rs
+++ b/crates/ide-assists/src/handlers/add_return_type.rs
diff --git a/crates/ide_assists/src/handlers/add_turbo_fish.rs b/crates/ide-assists/src/handlers/add_turbo_fish.rs
index a82dca9db07..a82dca9db07 100644
--- a/crates/ide_assists/src/handlers/add_turbo_fish.rs
+++ b/crates/ide-assists/src/handlers/add_turbo_fish.rs
diff --git a/crates/ide_assists/src/handlers/apply_demorgan.rs b/crates/ide-assists/src/handlers/apply_demorgan.rs
index 21907ab41fb..21907ab41fb 100644
--- a/crates/ide_assists/src/handlers/apply_demorgan.rs
+++ b/crates/ide-assists/src/handlers/apply_demorgan.rs
diff --git a/crates/ide_assists/src/handlers/auto_import.rs b/crates/ide-assists/src/handlers/auto_import.rs
index 874563c6f78..874563c6f78 100644
--- a/crates/ide_assists/src/handlers/auto_import.rs
+++ b/crates/ide-assists/src/handlers/auto_import.rs
diff --git a/crates/ide_assists/src/handlers/change_visibility.rs b/crates/ide-assists/src/handlers/change_visibility.rs
index 5f15e923ad8..5f15e923ad8 100644
--- a/crates/ide_assists/src/handlers/change_visibility.rs
+++ b/crates/ide-assists/src/handlers/change_visibility.rs
diff --git a/crates/ide_assists/src/handlers/convert_bool_then.rs b/crates/ide-assists/src/handlers/convert_bool_then.rs
index f9ec9326b65..f9ec9326b65 100644
--- a/crates/ide_assists/src/handlers/convert_bool_then.rs
+++ b/crates/ide-assists/src/handlers/convert_bool_then.rs
diff --git a/crates/ide_assists/src/handlers/convert_comment_block.rs b/crates/ide-assists/src/handlers/convert_comment_block.rs
index 3261f565259..3261f565259 100644
--- a/crates/ide_assists/src/handlers/convert_comment_block.rs
+++ b/crates/ide-assists/src/handlers/convert_comment_block.rs
diff --git a/crates/ide_assists/src/handlers/convert_integer_literal.rs b/crates/ide-assists/src/handlers/convert_integer_literal.rs
index a8a819cfcc4..a8a819cfcc4 100644
--- a/crates/ide_assists/src/handlers/convert_integer_literal.rs
+++ b/crates/ide-assists/src/handlers/convert_integer_literal.rs
diff --git a/crates/ide_assists/src/handlers/convert_into_to_from.rs b/crates/ide-assists/src/handlers/convert_into_to_from.rs
index 869f76951d2..869f76951d2 100644
--- a/crates/ide_assists/src/handlers/convert_into_to_from.rs
+++ b/crates/ide-assists/src/handlers/convert_into_to_from.rs
diff --git a/crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs b/crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs
index 711b9145610..711b9145610 100644
--- a/crates/ide_assists/src/handlers/convert_iter_for_each_to_for.rs
+++ b/crates/ide-assists/src/handlers/convert_iter_for_each_to_for.rs
diff --git a/crates/ide_assists/src/handlers/convert_to_guarded_return.rs b/crates/ide-assists/src/handlers/convert_to_guarded_return.rs
index 445567b7f90..445567b7f90 100644
--- a/crates/ide_assists/src/handlers/convert_to_guarded_return.rs
+++ b/crates/ide-assists/src/handlers/convert_to_guarded_return.rs
diff --git a/crates/ide_assists/src/handlers/convert_tuple_struct_to_named_struct.rs b/crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs
index 8093ba2560c..8093ba2560c 100644
--- a/crates/ide_assists/src/handlers/convert_tuple_struct_to_named_struct.rs
+++ b/crates/ide-assists/src/handlers/convert_tuple_struct_to_named_struct.rs
diff --git a/crates/ide_assists/src/handlers/convert_while_to_loop.rs b/crates/ide-assists/src/handlers/convert_while_to_loop.rs
index 739097067d0..739097067d0 100644
--- a/crates/ide_assists/src/handlers/convert_while_to_loop.rs
+++ b/crates/ide-assists/src/handlers/convert_while_to_loop.rs
diff --git a/crates/ide_assists/src/handlers/destructure_tuple_binding.rs b/crates/ide-assists/src/handlers/destructure_tuple_binding.rs
index ac17e3f057a..ac17e3f057a 100644
--- a/crates/ide_assists/src/handlers/destructure_tuple_binding.rs
+++ b/crates/ide-assists/src/handlers/destructure_tuple_binding.rs
diff --git a/crates/ide_assists/src/handlers/expand_glob_import.rs b/crates/ide-assists/src/handlers/expand_glob_import.rs
index ba5a47f4df8..ba5a47f4df8 100644
--- a/crates/ide_assists/src/handlers/expand_glob_import.rs
+++ b/crates/ide-assists/src/handlers/expand_glob_import.rs
diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide-assists/src/handlers/extract_function.rs
index 4df7c4177c8..4df7c4177c8 100644
--- a/crates/ide_assists/src/handlers/extract_function.rs
+++ b/crates/ide-assists/src/handlers/extract_function.rs
diff --git a/crates/ide_assists/src/handlers/extract_module.rs b/crates/ide-assists/src/handlers/extract_module.rs
index b5ed5699c90..b5ed5699c90 100644
--- a/crates/ide_assists/src/handlers/extract_module.rs
+++ b/crates/ide-assists/src/handlers/extract_module.rs
diff --git a/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs
index ebfd65ae795..ebfd65ae795 100644
--- a/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/ide-assists/src/handlers/extract_struct_from_enum_variant.rs
diff --git a/crates/ide_assists/src/handlers/extract_type_alias.rs b/crates/ide-assists/src/handlers/extract_type_alias.rs
index f664aa6dbf9..f664aa6dbf9 100644
--- a/crates/ide_assists/src/handlers/extract_type_alias.rs
+++ b/crates/ide-assists/src/handlers/extract_type_alias.rs
diff --git a/crates/ide_assists/src/handlers/extract_variable.rs b/crates/ide-assists/src/handlers/extract_variable.rs
index ecf9feb0e55..ecf9feb0e55 100644
--- a/crates/ide_assists/src/handlers/extract_variable.rs
+++ b/crates/ide-assists/src/handlers/extract_variable.rs
diff --git a/crates/ide_assists/src/handlers/fix_visibility.rs b/crates/ide-assists/src/handlers/fix_visibility.rs
index b895208f413..b895208f413 100644
--- a/crates/ide_assists/src/handlers/fix_visibility.rs
+++ b/crates/ide-assists/src/handlers/fix_visibility.rs
diff --git a/crates/ide_assists/src/handlers/flip_binexpr.rs b/crates/ide-assists/src/handlers/flip_binexpr.rs
index 19e85b27f98..19e85b27f98 100644
--- a/crates/ide_assists/src/handlers/flip_binexpr.rs
+++ b/crates/ide-assists/src/handlers/flip_binexpr.rs
diff --git a/crates/ide_assists/src/handlers/flip_comma.rs b/crates/ide-assists/src/handlers/flip_comma.rs
index 99be5e090ce..99be5e090ce 100644
--- a/crates/ide_assists/src/handlers/flip_comma.rs
+++ b/crates/ide-assists/src/handlers/flip_comma.rs
diff --git a/crates/ide_assists/src/handlers/flip_trait_bound.rs b/crates/ide-assists/src/handlers/flip_trait_bound.rs
index a868aa43d6d..a868aa43d6d 100644
--- a/crates/ide_assists/src/handlers/flip_trait_bound.rs
+++ b/crates/ide-assists/src/handlers/flip_trait_bound.rs
diff --git a/crates/ide_assists/src/handlers/generate_constant.rs b/crates/ide-assists/src/handlers/generate_constant.rs
index c4b759d5f3c..c4b759d5f3c 100644
--- a/crates/ide_assists/src/handlers/generate_constant.rs
+++ b/crates/ide-assists/src/handlers/generate_constant.rs
diff --git a/crates/ide_assists/src/handlers/generate_default_from_enum_variant.rs b/crates/ide-assists/src/handlers/generate_default_from_enum_variant.rs
index 4d47437f7c1..4d47437f7c1 100644
--- a/crates/ide_assists/src/handlers/generate_default_from_enum_variant.rs
+++ b/crates/ide-assists/src/handlers/generate_default_from_enum_variant.rs
diff --git a/crates/ide_assists/src/handlers/generate_default_from_new.rs b/crates/ide-assists/src/handlers/generate_default_from_new.rs
index 119bb6e07b4..119bb6e07b4 100644
--- a/crates/ide_assists/src/handlers/generate_default_from_new.rs
+++ b/crates/ide-assists/src/handlers/generate_default_from_new.rs
diff --git a/crates/ide_assists/src/handlers/generate_delegate_methods.rs b/crates/ide-assists/src/handlers/generate_delegate_methods.rs
index 120acde8e5b..120acde8e5b 100644
--- a/crates/ide_assists/src/handlers/generate_delegate_methods.rs
+++ b/crates/ide-assists/src/handlers/generate_delegate_methods.rs
diff --git a/crates/ide_assists/src/handlers/generate_deref.rs b/crates/ide-assists/src/handlers/generate_deref.rs
index 3cb8a68687e..3cb8a68687e 100644
--- a/crates/ide_assists/src/handlers/generate_deref.rs
+++ b/crates/ide-assists/src/handlers/generate_deref.rs
diff --git a/crates/ide_assists/src/handlers/generate_derive.rs b/crates/ide-assists/src/handlers/generate_derive.rs
index 28483f795e0..28483f795e0 100644
--- a/crates/ide_assists/src/handlers/generate_derive.rs
+++ b/crates/ide-assists/src/handlers/generate_derive.rs
diff --git a/crates/ide_assists/src/handlers/generate_documentation_template.rs b/crates/ide-assists/src/handlers/generate_documentation_template.rs
index 3eaa445d322..3eaa445d322 100644
--- a/crates/ide_assists/src/handlers/generate_documentation_template.rs
+++ b/crates/ide-assists/src/handlers/generate_documentation_template.rs
diff --git a/crates/ide_assists/src/handlers/generate_enum_is_method.rs b/crates/ide-assists/src/handlers/generate_enum_is_method.rs
index 28e0b433a63..28e0b433a63 100644
--- a/crates/ide_assists/src/handlers/generate_enum_is_method.rs
+++ b/crates/ide-assists/src/handlers/generate_enum_is_method.rs
diff --git a/crates/ide_assists/src/handlers/generate_enum_projection_method.rs b/crates/ide-assists/src/handlers/generate_enum_projection_method.rs
index fe7a3cd5357..fe7a3cd5357 100644
--- a/crates/ide_assists/src/handlers/generate_enum_projection_method.rs
+++ b/crates/ide-assists/src/handlers/generate_enum_projection_method.rs
diff --git a/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs b/crates/ide-assists/src/handlers/generate_from_impl_for_enum.rs
index f7be3238241..f7be3238241 100644
--- a/crates/ide_assists/src/handlers/generate_from_impl_for_enum.rs
+++ b/crates/ide-assists/src/handlers/generate_from_impl_for_enum.rs
diff --git a/crates/ide_assists/src/handlers/generate_function.rs b/crates/ide-assists/src/handlers/generate_function.rs
index 24cef5630f1..24cef5630f1 100644
--- a/crates/ide_assists/src/handlers/generate_function.rs
+++ b/crates/ide-assists/src/handlers/generate_function.rs
diff --git a/crates/ide_assists/src/handlers/generate_getter.rs b/crates/ide-assists/src/handlers/generate_getter.rs
index 9513c112f32..9513c112f32 100644
--- a/crates/ide_assists/src/handlers/generate_getter.rs
+++ b/crates/ide-assists/src/handlers/generate_getter.rs
diff --git a/crates/ide_assists/src/handlers/generate_impl.rs b/crates/ide-assists/src/handlers/generate_impl.rs
index 58fea103f85..58fea103f85 100644
--- a/crates/ide_assists/src/handlers/generate_impl.rs
+++ b/crates/ide-assists/src/handlers/generate_impl.rs
diff --git a/crates/ide_assists/src/handlers/generate_is_empty_from_len.rs b/crates/ide-assists/src/handlers/generate_is_empty_from_len.rs
index 1ad1cea43fc..1ad1cea43fc 100644
--- a/crates/ide_assists/src/handlers/generate_is_empty_from_len.rs
+++ b/crates/ide-assists/src/handlers/generate_is_empty_from_len.rs
diff --git a/crates/ide_assists/src/handlers/generate_new.rs b/crates/ide-assists/src/handlers/generate_new.rs
index 6a1f710f6d5..6a1f710f6d5 100644
--- a/crates/ide_assists/src/handlers/generate_new.rs
+++ b/crates/ide-assists/src/handlers/generate_new.rs
diff --git a/crates/ide_assists/src/handlers/generate_setter.rs b/crates/ide-assists/src/handlers/generate_setter.rs
index 5005ac9f5c1..5005ac9f5c1 100644
--- a/crates/ide_assists/src/handlers/generate_setter.rs
+++ b/crates/ide-assists/src/handlers/generate_setter.rs
diff --git a/crates/ide_assists/src/handlers/inline_call.rs b/crates/ide-assists/src/handlers/inline_call.rs
index ab614b0ace9..ab614b0ace9 100644
--- a/crates/ide_assists/src/handlers/inline_call.rs
+++ b/crates/ide-assists/src/handlers/inline_call.rs
diff --git a/crates/ide_assists/src/handlers/inline_local_variable.rs b/crates/ide-assists/src/handlers/inline_local_variable.rs
index 65dc2a0d511..65dc2a0d511 100644
--- a/crates/ide_assists/src/handlers/inline_local_variable.rs
+++ b/crates/ide-assists/src/handlers/inline_local_variable.rs
diff --git a/crates/ide_assists/src/handlers/inline_type_alias.rs b/crates/ide-assists/src/handlers/inline_type_alias.rs
index bc4a07358cc..bc4a07358cc 100644
--- a/crates/ide_assists/src/handlers/inline_type_alias.rs
+++ b/crates/ide-assists/src/handlers/inline_type_alias.rs
diff --git a/crates/ide_assists/src/handlers/introduce_named_generic.rs b/crates/ide-assists/src/handlers/introduce_named_generic.rs
index 636b05dca9a..636b05dca9a 100644
--- a/crates/ide_assists/src/handlers/introduce_named_generic.rs
+++ b/crates/ide-assists/src/handlers/introduce_named_generic.rs
diff --git a/crates/ide_assists/src/handlers/introduce_named_lifetime.rs b/crates/ide-assists/src/handlers/introduce_named_lifetime.rs
index fa7635d1232..fa7635d1232 100644
--- a/crates/ide_assists/src/handlers/introduce_named_lifetime.rs
+++ b/crates/ide-assists/src/handlers/introduce_named_lifetime.rs
diff --git a/crates/ide_assists/src/handlers/invert_if.rs b/crates/ide-assists/src/handlers/invert_if.rs
index 6eed59c9ea4..6eed59c9ea4 100644
--- a/crates/ide_assists/src/handlers/invert_if.rs
+++ b/crates/ide-assists/src/handlers/invert_if.rs
diff --git a/crates/ide_assists/src/handlers/merge_imports.rs b/crates/ide-assists/src/handlers/merge_imports.rs
index 705ae666176..705ae666176 100644
--- a/crates/ide_assists/src/handlers/merge_imports.rs
+++ b/crates/ide-assists/src/handlers/merge_imports.rs
diff --git a/crates/ide_assists/src/handlers/merge_match_arms.rs b/crates/ide-assists/src/handlers/merge_match_arms.rs
index c87bd7f1527..c87bd7f1527 100644
--- a/crates/ide_assists/src/handlers/merge_match_arms.rs
+++ b/crates/ide-assists/src/handlers/merge_match_arms.rs
diff --git a/crates/ide_assists/src/handlers/move_bounds.rs b/crates/ide-assists/src/handlers/move_bounds.rs
index 425dba1a75f..425dba1a75f 100644
--- a/crates/ide_assists/src/handlers/move_bounds.rs
+++ b/crates/ide-assists/src/handlers/move_bounds.rs
diff --git a/crates/ide_assists/src/handlers/move_from_mod_rs.rs b/crates/ide-assists/src/handlers/move_from_mod_rs.rs
index b49c2e5da58..b49c2e5da58 100644
--- a/crates/ide_assists/src/handlers/move_from_mod_rs.rs
+++ b/crates/ide-assists/src/handlers/move_from_mod_rs.rs
diff --git a/crates/ide_assists/src/handlers/move_guard.rs b/crates/ide-assists/src/handlers/move_guard.rs
index 5c05cb921d9..5c05cb921d9 100644
--- a/crates/ide_assists/src/handlers/move_guard.rs
+++ b/crates/ide-assists/src/handlers/move_guard.rs
diff --git a/crates/ide_assists/src/handlers/move_module_to_file.rs b/crates/ide-assists/src/handlers/move_module_to_file.rs
index 759494dcf02..759494dcf02 100644
--- a/crates/ide_assists/src/handlers/move_module_to_file.rs
+++ b/crates/ide-assists/src/handlers/move_module_to_file.rs
diff --git a/crates/ide_assists/src/handlers/move_to_mod_rs.rs b/crates/ide-assists/src/handlers/move_to_mod_rs.rs
index 887960881a2..887960881a2 100644
--- a/crates/ide_assists/src/handlers/move_to_mod_rs.rs
+++ b/crates/ide-assists/src/handlers/move_to_mod_rs.rs
diff --git a/crates/ide_assists/src/handlers/number_representation.rs b/crates/ide-assists/src/handlers/number_representation.rs
index f77471d80cb..f77471d80cb 100644
--- a/crates/ide_assists/src/handlers/number_representation.rs
+++ b/crates/ide-assists/src/handlers/number_representation.rs
diff --git a/crates/ide_assists/src/handlers/promote_local_to_const.rs b/crates/ide-assists/src/handlers/promote_local_to_const.rs
index 65c14406f98..65c14406f98 100644
--- a/crates/ide_assists/src/handlers/promote_local_to_const.rs
+++ b/crates/ide-assists/src/handlers/promote_local_to_const.rs
diff --git a/crates/ide_assists/src/handlers/pull_assignment_up.rs b/crates/ide-assists/src/handlers/pull_assignment_up.rs
index d142397c24f..d142397c24f 100644
--- a/crates/ide_assists/src/handlers/pull_assignment_up.rs
+++ b/crates/ide-assists/src/handlers/pull_assignment_up.rs
diff --git a/crates/ide_assists/src/handlers/qualify_method_call.rs b/crates/ide-assists/src/handlers/qualify_method_call.rs
index ba0a1427181..ba0a1427181 100644
--- a/crates/ide_assists/src/handlers/qualify_method_call.rs
+++ b/crates/ide-assists/src/handlers/qualify_method_call.rs
diff --git a/crates/ide_assists/src/handlers/qualify_path.rs b/crates/ide-assists/src/handlers/qualify_path.rs
index 5deb60f57b1..5deb60f57b1 100644
--- a/crates/ide_assists/src/handlers/qualify_path.rs
+++ b/crates/ide-assists/src/handlers/qualify_path.rs
diff --git a/crates/ide_assists/src/handlers/raw_string.rs b/crates/ide-assists/src/handlers/raw_string.rs
index 41f768c3175..41f768c3175 100644
--- a/crates/ide_assists/src/handlers/raw_string.rs
+++ b/crates/ide-assists/src/handlers/raw_string.rs
diff --git a/crates/ide_assists/src/handlers/remove_dbg.rs b/crates/ide-assists/src/handlers/remove_dbg.rs
index 01cd32f55c6..01cd32f55c6 100644
--- a/crates/ide_assists/src/handlers/remove_dbg.rs
+++ b/crates/ide-assists/src/handlers/remove_dbg.rs
diff --git a/crates/ide_assists/src/handlers/remove_mut.rs b/crates/ide-assists/src/handlers/remove_mut.rs
index 30d36dacd28..30d36dacd28 100644
--- a/crates/ide_assists/src/handlers/remove_mut.rs
+++ b/crates/ide-assists/src/handlers/remove_mut.rs
diff --git a/crates/ide_assists/src/handlers/remove_unused_param.rs b/crates/ide-assists/src/handlers/remove_unused_param.rs
index 80e2ca918b9..80e2ca918b9 100644
--- a/crates/ide_assists/src/handlers/remove_unused_param.rs
+++ b/crates/ide-assists/src/handlers/remove_unused_param.rs
diff --git a/crates/ide_assists/src/handlers/reorder_fields.rs b/crates/ide-assists/src/handlers/reorder_fields.rs
index 35c4cb6d641..35c4cb6d641 100644
--- a/crates/ide_assists/src/handlers/reorder_fields.rs
+++ b/crates/ide-assists/src/handlers/reorder_fields.rs
diff --git a/crates/ide_assists/src/handlers/reorder_impl.rs b/crates/ide-assists/src/handlers/reorder_impl.rs
index c0991c6080d..c0991c6080d 100644
--- a/crates/ide_assists/src/handlers/reorder_impl.rs
+++ b/crates/ide-assists/src/handlers/reorder_impl.rs
diff --git a/crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs
index 03e41b43407..03e41b43407 100644
--- a/crates/ide_assists/src/handlers/replace_derive_with_manual_impl.rs
+++ b/crates/ide-assists/src/handlers/replace_derive_with_manual_impl.rs
diff --git a/crates/ide_assists/src/handlers/replace_if_let_with_match.rs b/crates/ide-assists/src/handlers/replace_if_let_with_match.rs
index 1c403eafe30..1c403eafe30 100644
--- a/crates/ide_assists/src/handlers/replace_if_let_with_match.rs
+++ b/crates/ide-assists/src/handlers/replace_if_let_with_match.rs
diff --git a/crates/ide_assists/src/handlers/replace_let_with_if_let.rs b/crates/ide-assists/src/handlers/replace_let_with_if_let.rs
index a5fa8a110d3..a5fa8a110d3 100644
--- a/crates/ide_assists/src/handlers/replace_let_with_if_let.rs
+++ b/crates/ide-assists/src/handlers/replace_let_with_if_let.rs
diff --git a/crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs b/crates/ide-assists/src/handlers/replace_qualified_name_with_use.rs
index 4800d549567..4800d549567 100644
--- a/crates/ide_assists/src/handlers/replace_qualified_name_with_use.rs
+++ b/crates/ide-assists/src/handlers/replace_qualified_name_with_use.rs
diff --git a/crates/ide_assists/src/handlers/replace_string_with_char.rs b/crates/ide-assists/src/handlers/replace_string_with_char.rs
index a53f865a5e1..a53f865a5e1 100644
--- a/crates/ide_assists/src/handlers/replace_string_with_char.rs
+++ b/crates/ide-assists/src/handlers/replace_string_with_char.rs
diff --git a/crates/ide_assists/src/handlers/replace_try_expr_with_match.rs b/crates/ide-assists/src/handlers/replace_try_expr_with_match.rs
index a1027361245..a1027361245 100644
--- a/crates/ide_assists/src/handlers/replace_try_expr_with_match.rs
+++ b/crates/ide-assists/src/handlers/replace_try_expr_with_match.rs
diff --git a/crates/ide_assists/src/handlers/replace_turbofish_with_explicit_type.rs b/crates/ide-assists/src/handlers/replace_turbofish_with_explicit_type.rs
index dc3c860d7ed..dc3c860d7ed 100644
--- a/crates/ide_assists/src/handlers/replace_turbofish_with_explicit_type.rs
+++ b/crates/ide-assists/src/handlers/replace_turbofish_with_explicit_type.rs
diff --git a/crates/ide_assists/src/handlers/sort_items.rs b/crates/ide-assists/src/handlers/sort_items.rs
index f784448471d..f784448471d 100644
--- a/crates/ide_assists/src/handlers/sort_items.rs
+++ b/crates/ide-assists/src/handlers/sort_items.rs
diff --git a/crates/ide_assists/src/handlers/split_import.rs b/crates/ide-assists/src/handlers/split_import.rs
index ac67874b31b..ac67874b31b 100644
--- a/crates/ide_assists/src/handlers/split_import.rs
+++ b/crates/ide-assists/src/handlers/split_import.rs
diff --git a/crates/ide_assists/src/handlers/toggle_ignore.rs b/crates/ide-assists/src/handlers/toggle_ignore.rs
index feaa24c1fe1..feaa24c1fe1 100644
--- a/crates/ide_assists/src/handlers/toggle_ignore.rs
+++ b/crates/ide-assists/src/handlers/toggle_ignore.rs
diff --git a/crates/ide_assists/src/handlers/unmerge_use.rs b/crates/ide-assists/src/handlers/unmerge_use.rs
index 7d73632c799..7d73632c799 100644
--- a/crates/ide_assists/src/handlers/unmerge_use.rs
+++ b/crates/ide-assists/src/handlers/unmerge_use.rs
diff --git a/crates/ide_assists/src/handlers/unnecessary_async.rs b/crates/ide-assists/src/handlers/unnecessary_async.rs
index d90fee7809e..d90fee7809e 100644
--- a/crates/ide_assists/src/handlers/unnecessary_async.rs
+++ b/crates/ide-assists/src/handlers/unnecessary_async.rs
diff --git a/crates/ide_assists/src/handlers/unwrap_block.rs b/crates/ide-assists/src/handlers/unwrap_block.rs
index 42c5e6f0883..42c5e6f0883 100644
--- a/crates/ide_assists/src/handlers/unwrap_block.rs
+++ b/crates/ide-assists/src/handlers/unwrap_block.rs
diff --git a/crates/ide_assists/src/handlers/unwrap_result_return_type.rs b/crates/ide-assists/src/handlers/unwrap_result_return_type.rs
index ff79c5b82a1..ff79c5b82a1 100644
--- a/crates/ide_assists/src/handlers/unwrap_result_return_type.rs
+++ b/crates/ide-assists/src/handlers/unwrap_result_return_type.rs
diff --git a/crates/ide_assists/src/handlers/wrap_return_type_in_result.rs b/crates/ide-assists/src/handlers/wrap_return_type_in_result.rs
index 251b41c84a4..251b41c84a4 100644
--- a/crates/ide_assists/src/handlers/wrap_return_type_in_result.rs
+++ b/crates/ide-assists/src/handlers/wrap_return_type_in_result.rs
diff --git a/crates/ide_assists/src/lib.rs b/crates/ide-assists/src/lib.rs
index ef4aa1c62bd..ef4aa1c62bd 100644
--- a/crates/ide_assists/src/lib.rs
+++ b/crates/ide-assists/src/lib.rs
diff --git a/crates/ide_assists/src/tests.rs b/crates/ide-assists/src/tests.rs
index 6b57f9962c6..6b57f9962c6 100644
--- a/crates/ide_assists/src/tests.rs
+++ b/crates/ide-assists/src/tests.rs
diff --git a/crates/ide_assists/src/tests/generated.rs b/crates/ide-assists/src/tests/generated.rs
index 8a1e95d8947..8a1e95d8947 100644
--- a/crates/ide_assists/src/tests/generated.rs
+++ b/crates/ide-assists/src/tests/generated.rs
diff --git a/crates/ide_assists/src/tests/sourcegen.rs b/crates/ide-assists/src/tests/sourcegen.rs
index 2af1de66fad..d45e54186bb 100644
--- a/crates/ide_assists/src/tests/sourcegen.rs
+++ b/crates/ide-assists/src/tests/sourcegen.rs
@@ -41,7 +41,7 @@ r#####"
         }
         let buf = sourcegen::add_preamble("sourcegen_assists_docs", sourcegen::reformat(buf));
         sourcegen::ensure_file_contents(
-            &project_root().join("crates/ide_assists/src/tests/generated.rs"),
+            &project_root().join("crates/ide-assists/src/tests/generated.rs"),
             &buf,
         );
     }
@@ -75,7 +75,7 @@ struct Assist {
 
 impl Assist {
     fn collect() -> Vec<Assist> {
-        let handlers_dir = project_root().join("crates/ide_assists/src/handlers");
+        let handlers_dir = project_root().join("crates/ide-assists/src/handlers");
 
         let mut res = Vec::new();
         for path in sourcegen::list_rust_files(&handlers_dir) {
diff --git a/crates/ide_assists/src/utils.rs b/crates/ide-assists/src/utils.rs
index 0add9507185..0add9507185 100644
--- a/crates/ide_assists/src/utils.rs
+++ b/crates/ide-assists/src/utils.rs
diff --git a/crates/ide_assists/src/utils/gen_trait_fn_body.rs b/crates/ide-assists/src/utils/gen_trait_fn_body.rs
index 30b994806ba..30b994806ba 100644
--- a/crates/ide_assists/src/utils/gen_trait_fn_body.rs
+++ b/crates/ide-assists/src/utils/gen_trait_fn_body.rs
diff --git a/crates/ide_assists/src/utils/suggest_name.rs b/crates/ide-assists/src/utils/suggest_name.rs
index 5b79a7495f7..5b79a7495f7 100644
--- a/crates/ide_assists/src/utils/suggest_name.rs
+++ b/crates/ide-assists/src/utils/suggest_name.rs
diff --git a/crates/ide_completion/Cargo.toml b/crates/ide-completion/Cargo.toml
index a82223ca900..4369e11bd71 100644
--- a/crates/ide_completion/Cargo.toml
+++ b/crates/ide-completion/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ide_completion"
+name = "ide-completion"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
@@ -18,16 +18,16 @@ smallvec = "1.8.0"
 
 stdx = { path = "../stdx", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
-text_edit = { path = "../text_edit", version = "0.0.0" }
-base_db = { path = "../base_db", version = "0.0.0" }
-ide_db = { path = "../ide_db", version = "0.0.0" }
+text-edit = { path = "../text-edit", version = "0.0.0" }
+base-db = { path = "../base-db", version = "0.0.0" }
+ide-db = { path = "../ide-db", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
 
 # completions crate should depend only on the top-level `hir` package. if you need
-# something from some `hir_xxx` subpackage, reexport the API via `hir`.
+# something from some `hir-xxx` subpackage, reexport the API via `hir`.
 hir = { path = "../hir", version = "0.0.0" }
 
 [dev-dependencies]
 expect-test = "1.2.2"
 
-test_utils = { path = "../test_utils" }
+test-utils = { path = "../test-utils" }
diff --git a/crates/ide_completion/src/completions.rs b/crates/ide-completion/src/completions.rs
index 36cee48aed6..36cee48aed6 100644
--- a/crates/ide_completion/src/completions.rs
+++ b/crates/ide-completion/src/completions.rs
diff --git a/crates/ide_completion/src/completions/attribute.rs b/crates/ide-completion/src/completions/attribute.rs
index 09ba672a14d..09ba672a14d 100644
--- a/crates/ide_completion/src/completions/attribute.rs
+++ b/crates/ide-completion/src/completions/attribute.rs
diff --git a/crates/ide_completion/src/completions/attribute/cfg.rs b/crates/ide-completion/src/completions/attribute/cfg.rs
index b7e69d7b43c..b7e69d7b43c 100644
--- a/crates/ide_completion/src/completions/attribute/cfg.rs
+++ b/crates/ide-completion/src/completions/attribute/cfg.rs
diff --git a/crates/ide_completion/src/completions/attribute/derive.rs b/crates/ide-completion/src/completions/attribute/derive.rs
index 4f524dd73bb..4f524dd73bb 100644
--- a/crates/ide_completion/src/completions/attribute/derive.rs
+++ b/crates/ide-completion/src/completions/attribute/derive.rs
diff --git a/crates/ide_completion/src/completions/attribute/lint.rs b/crates/ide-completion/src/completions/attribute/lint.rs
index 8991d657e85..8991d657e85 100644
--- a/crates/ide_completion/src/completions/attribute/lint.rs
+++ b/crates/ide-completion/src/completions/attribute/lint.rs
diff --git a/crates/ide_completion/src/completions/attribute/repr.rs b/crates/ide-completion/src/completions/attribute/repr.rs
index 1dcec5f4939..1dcec5f4939 100644
--- a/crates/ide_completion/src/completions/attribute/repr.rs
+++ b/crates/ide-completion/src/completions/attribute/repr.rs
diff --git a/crates/ide_completion/src/completions/dot.rs b/crates/ide-completion/src/completions/dot.rs
index f9df33d88b0..f9df33d88b0 100644
--- a/crates/ide_completion/src/completions/dot.rs
+++ b/crates/ide-completion/src/completions/dot.rs
diff --git a/crates/ide_completion/src/completions/extern_abi.rs b/crates/ide-completion/src/completions/extern_abi.rs
index 87fccec008e..87fccec008e 100644
--- a/crates/ide_completion/src/completions/extern_abi.rs
+++ b/crates/ide-completion/src/completions/extern_abi.rs
diff --git a/crates/ide_completion/src/completions/flyimport.rs b/crates/ide-completion/src/completions/flyimport.rs
index 76d708ae51a..76d708ae51a 100644
--- a/crates/ide_completion/src/completions/flyimport.rs
+++ b/crates/ide-completion/src/completions/flyimport.rs
diff --git a/crates/ide_completion/src/completions/fn_param.rs b/crates/ide-completion/src/completions/fn_param.rs
index 47cead7d570..47cead7d570 100644
--- a/crates/ide_completion/src/completions/fn_param.rs
+++ b/crates/ide-completion/src/completions/fn_param.rs
diff --git a/crates/ide_completion/src/completions/format_string.rs b/crates/ide-completion/src/completions/format_string.rs
index f0c994f6b66..f0c994f6b66 100644
--- a/crates/ide_completion/src/completions/format_string.rs
+++ b/crates/ide-completion/src/completions/format_string.rs
diff --git a/crates/ide_completion/src/completions/keyword.rs b/crates/ide-completion/src/completions/keyword.rs
index 51405e35232..51405e35232 100644
--- a/crates/ide_completion/src/completions/keyword.rs
+++ b/crates/ide-completion/src/completions/keyword.rs
diff --git a/crates/ide_completion/src/completions/lifetime.rs b/crates/ide-completion/src/completions/lifetime.rs
index 66f87239120..66f87239120 100644
--- a/crates/ide_completion/src/completions/lifetime.rs
+++ b/crates/ide-completion/src/completions/lifetime.rs
diff --git a/crates/ide_completion/src/completions/mod_.rs b/crates/ide-completion/src/completions/mod_.rs
index cf7566bcc3c..cf7566bcc3c 100644
--- a/crates/ide_completion/src/completions/mod_.rs
+++ b/crates/ide-completion/src/completions/mod_.rs
diff --git a/crates/ide_completion/src/completions/pattern.rs b/crates/ide-completion/src/completions/pattern.rs
index 16666eba458..16666eba458 100644
--- a/crates/ide_completion/src/completions/pattern.rs
+++ b/crates/ide-completion/src/completions/pattern.rs
diff --git a/crates/ide_completion/src/completions/postfix.rs b/crates/ide-completion/src/completions/postfix.rs
index 5bd69b0c1c3..5bd69b0c1c3 100644
--- a/crates/ide_completion/src/completions/postfix.rs
+++ b/crates/ide-completion/src/completions/postfix.rs
diff --git a/crates/ide_completion/src/completions/postfix/format_like.rs b/crates/ide-completion/src/completions/postfix/format_like.rs
index b5ef87b8812..b5ef87b8812 100644
--- a/crates/ide_completion/src/completions/postfix/format_like.rs
+++ b/crates/ide-completion/src/completions/postfix/format_like.rs
diff --git a/crates/ide_completion/src/completions/qualified_path.rs b/crates/ide-completion/src/completions/qualified_path.rs
index 2c2fe524ef9..2c2fe524ef9 100644
--- a/crates/ide_completion/src/completions/qualified_path.rs
+++ b/crates/ide-completion/src/completions/qualified_path.rs
diff --git a/crates/ide_completion/src/completions/record.rs b/crates/ide-completion/src/completions/record.rs
index 6057c0e0043..6057c0e0043 100644
--- a/crates/ide_completion/src/completions/record.rs
+++ b/crates/ide-completion/src/completions/record.rs
diff --git a/crates/ide_completion/src/completions/snippet.rs b/crates/ide-completion/src/completions/snippet.rs
index c00de6ff50f..c00de6ff50f 100644
--- a/crates/ide_completion/src/completions/snippet.rs
+++ b/crates/ide-completion/src/completions/snippet.rs
diff --git a/crates/ide_completion/src/completions/trait_impl.rs b/crates/ide-completion/src/completions/trait_impl.rs
index 43428f777f0..43428f777f0 100644
--- a/crates/ide_completion/src/completions/trait_impl.rs
+++ b/crates/ide-completion/src/completions/trait_impl.rs
diff --git a/crates/ide_completion/src/completions/unqualified_path.rs b/crates/ide-completion/src/completions/unqualified_path.rs
index 94142e274ae..94142e274ae 100644
--- a/crates/ide_completion/src/completions/unqualified_path.rs
+++ b/crates/ide-completion/src/completions/unqualified_path.rs
diff --git a/crates/ide_completion/src/completions/use_.rs b/crates/ide-completion/src/completions/use_.rs
index 25eb3fb908c..25eb3fb908c 100644
--- a/crates/ide_completion/src/completions/use_.rs
+++ b/crates/ide-completion/src/completions/use_.rs
diff --git a/crates/ide_completion/src/completions/vis.rs b/crates/ide-completion/src/completions/vis.rs
index 7315a488b8d..7315a488b8d 100644
--- a/crates/ide_completion/src/completions/vis.rs
+++ b/crates/ide-completion/src/completions/vis.rs
diff --git a/crates/ide_completion/src/config.rs b/crates/ide-completion/src/config.rs
index 302836dd1e1..302836dd1e1 100644
--- a/crates/ide_completion/src/config.rs
+++ b/crates/ide-completion/src/config.rs
diff --git a/crates/ide_completion/src/context.rs b/crates/ide-completion/src/context.rs
index f75aa8f9ff8..f75aa8f9ff8 100644
--- a/crates/ide_completion/src/context.rs
+++ b/crates/ide-completion/src/context.rs
diff --git a/crates/ide_completion/src/item.rs b/crates/ide-completion/src/item.rs
index 29b073cfa52..29b073cfa52 100644
--- a/crates/ide_completion/src/item.rs
+++ b/crates/ide-completion/src/item.rs
diff --git a/crates/ide_completion/src/lib.rs b/crates/ide-completion/src/lib.rs
index 6924ba1db6d..6924ba1db6d 100644
--- a/crates/ide_completion/src/lib.rs
+++ b/crates/ide-completion/src/lib.rs
diff --git a/crates/ide_completion/src/patterns.rs b/crates/ide-completion/src/patterns.rs
index 6fdec783854..6fdec783854 100644
--- a/crates/ide_completion/src/patterns.rs
+++ b/crates/ide-completion/src/patterns.rs
diff --git a/crates/ide_completion/src/render.rs b/crates/ide-completion/src/render.rs
index 836b14bc2cd..836b14bc2cd 100644
--- a/crates/ide_completion/src/render.rs
+++ b/crates/ide-completion/src/render.rs
diff --git a/crates/ide_completion/src/render/const_.rs b/crates/ide-completion/src/render/const_.rs
index 89e6c82ddef..89e6c82ddef 100644
--- a/crates/ide_completion/src/render/const_.rs
+++ b/crates/ide-completion/src/render/const_.rs
diff --git a/crates/ide_completion/src/render/function.rs b/crates/ide-completion/src/render/function.rs
index d8183660e89..d8183660e89 100644
--- a/crates/ide_completion/src/render/function.rs
+++ b/crates/ide-completion/src/render/function.rs
diff --git a/crates/ide_completion/src/render/literal.rs b/crates/ide-completion/src/render/literal.rs
index f1773137fed..f1773137fed 100644
--- a/crates/ide_completion/src/render/literal.rs
+++ b/crates/ide-completion/src/render/literal.rs
diff --git a/crates/ide_completion/src/render/macro_.rs b/crates/ide-completion/src/render/macro_.rs
index ba18e5d2165..ba18e5d2165 100644
--- a/crates/ide_completion/src/render/macro_.rs
+++ b/crates/ide-completion/src/render/macro_.rs
diff --git a/crates/ide_completion/src/render/pattern.rs b/crates/ide-completion/src/render/pattern.rs
index ff61bf61c54..ff61bf61c54 100644
--- a/crates/ide_completion/src/render/pattern.rs
+++ b/crates/ide-completion/src/render/pattern.rs
diff --git a/crates/ide_completion/src/render/type_alias.rs b/crates/ide-completion/src/render/type_alias.rs
index a518be87bf0..a518be87bf0 100644
--- a/crates/ide_completion/src/render/type_alias.rs
+++ b/crates/ide-completion/src/render/type_alias.rs
diff --git a/crates/ide_completion/src/render/union_literal.rs b/crates/ide-completion/src/render/union_literal.rs
index aafedaf5aa7..aafedaf5aa7 100644
--- a/crates/ide_completion/src/render/union_literal.rs
+++ b/crates/ide-completion/src/render/union_literal.rs
diff --git a/crates/ide_completion/src/render/variant.rs b/crates/ide-completion/src/render/variant.rs
index 39a37dc9f8e..39a37dc9f8e 100644
--- a/crates/ide_completion/src/render/variant.rs
+++ b/crates/ide-completion/src/render/variant.rs
diff --git a/crates/ide_completion/src/snippet.rs b/crates/ide-completion/src/snippet.rs
index 82632f440d4..82632f440d4 100644
--- a/crates/ide_completion/src/snippet.rs
+++ b/crates/ide-completion/src/snippet.rs
diff --git a/crates/ide_completion/src/tests.rs b/crates/ide-completion/src/tests.rs
index 470fc37ca73..470fc37ca73 100644
--- a/crates/ide_completion/src/tests.rs
+++ b/crates/ide-completion/src/tests.rs
diff --git a/crates/ide_completion/src/tests/attribute.rs b/crates/ide-completion/src/tests/attribute.rs
index b851bf6a840..b851bf6a840 100644
--- a/crates/ide_completion/src/tests/attribute.rs
+++ b/crates/ide-completion/src/tests/attribute.rs
diff --git a/crates/ide_completion/src/tests/expression.rs b/crates/ide-completion/src/tests/expression.rs
index 5984149046a..5984149046a 100644
--- a/crates/ide_completion/src/tests/expression.rs
+++ b/crates/ide-completion/src/tests/expression.rs
diff --git a/crates/ide_completion/src/tests/flyimport.rs b/crates/ide-completion/src/tests/flyimport.rs
index 41e6cf7aeeb..41e6cf7aeeb 100644
--- a/crates/ide_completion/src/tests/flyimport.rs
+++ b/crates/ide-completion/src/tests/flyimport.rs
diff --git a/crates/ide_completion/src/tests/fn_param.rs b/crates/ide-completion/src/tests/fn_param.rs
index 4578955da1e..4578955da1e 100644
--- a/crates/ide_completion/src/tests/fn_param.rs
+++ b/crates/ide-completion/src/tests/fn_param.rs
diff --git a/crates/ide_completion/src/tests/item.rs b/crates/ide-completion/src/tests/item.rs
index ed341b361ac..ed341b361ac 100644
--- a/crates/ide_completion/src/tests/item.rs
+++ b/crates/ide-completion/src/tests/item.rs
diff --git a/crates/ide_completion/src/tests/item_list.rs b/crates/ide-completion/src/tests/item_list.rs
index 0e60f748790..0e60f748790 100644
--- a/crates/ide_completion/src/tests/item_list.rs
+++ b/crates/ide-completion/src/tests/item_list.rs
diff --git a/crates/ide_completion/src/tests/pattern.rs b/crates/ide-completion/src/tests/pattern.rs
index 3b592635288..3b592635288 100644
--- a/crates/ide_completion/src/tests/pattern.rs
+++ b/crates/ide-completion/src/tests/pattern.rs
diff --git a/crates/ide_completion/src/tests/predicate.rs b/crates/ide-completion/src/tests/predicate.rs
index 5e975d715f6..5e975d715f6 100644
--- a/crates/ide_completion/src/tests/predicate.rs
+++ b/crates/ide-completion/src/tests/predicate.rs
diff --git a/crates/ide_completion/src/tests/proc_macros.rs b/crates/ide-completion/src/tests/proc_macros.rs
index f54286fe592..f54286fe592 100644
--- a/crates/ide_completion/src/tests/proc_macros.rs
+++ b/crates/ide-completion/src/tests/proc_macros.rs
diff --git a/crates/ide_completion/src/tests/record.rs b/crates/ide-completion/src/tests/record.rs
index 0322ecbe39f..0322ecbe39f 100644
--- a/crates/ide_completion/src/tests/record.rs
+++ b/crates/ide-completion/src/tests/record.rs
diff --git a/crates/ide_completion/src/tests/type_pos.rs b/crates/ide-completion/src/tests/type_pos.rs
index e3ffb92f786..e3ffb92f786 100644
--- a/crates/ide_completion/src/tests/type_pos.rs
+++ b/crates/ide-completion/src/tests/type_pos.rs
diff --git a/crates/ide_completion/src/tests/use_tree.rs b/crates/ide-completion/src/tests/use_tree.rs
index ca06cc376ff..ca06cc376ff 100644
--- a/crates/ide_completion/src/tests/use_tree.rs
+++ b/crates/ide-completion/src/tests/use_tree.rs
diff --git a/crates/ide_completion/src/tests/visibility.rs b/crates/ide-completion/src/tests/visibility.rs
index 970eb707192..970eb707192 100644
--- a/crates/ide_completion/src/tests/visibility.rs
+++ b/crates/ide-completion/src/tests/visibility.rs
diff --git a/crates/ide_db/Cargo.toml b/crates/ide-db/Cargo.toml
index 8c4fe95de18..c5f0cb3c014 100644
--- a/crates/ide_db/Cargo.toml
+++ b/crates/ide-db/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ide_db"
+name = "ide-db"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
@@ -24,16 +24,16 @@ indexmap = "1.8.0"
 stdx = { path = "../stdx", version = "0.0.0" }
 parser = { path = "../parser", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
-text_edit = { path = "../text_edit", version = "0.0.0" }
-base_db = { path = "../base_db", version = "0.0.0" }
+text-edit = { path = "../text-edit", version = "0.0.0" }
+base-db = { path = "../base-db", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
 # ide should depend only on the top-level `hir` package. if you need
-# something from some `hir_xxx` subpackage, reexport the API via `hir`.
+# something from some `hir-xxx` subpackage, reexport the API via `hir`.
 hir = { path = "../hir", version = "0.0.0" }
 limit = { path = "../limit", version = "0.0.0" }
 
 [dev-dependencies]
-test_utils = { path = "../test_utils" }
+test-utils = { path = "../test-utils" }
 sourcegen = { path = "../sourcegen" }
 xshell = "0.2.1"
 expect-test = "1.2.2"
diff --git a/crates/ide_db/src/active_parameter.rs b/crates/ide-db/src/active_parameter.rs
index 788a5ed17e6..788a5ed17e6 100644
--- a/crates/ide_db/src/active_parameter.rs
+++ b/crates/ide-db/src/active_parameter.rs
diff --git a/crates/ide_db/src/apply_change.rs b/crates/ide-db/src/apply_change.rs
index 98b0e9c947a..98b0e9c947a 100644
--- a/crates/ide_db/src/apply_change.rs
+++ b/crates/ide-db/src/apply_change.rs
diff --git a/crates/ide_db/src/assists.rs b/crates/ide-db/src/assists.rs
index da23763dc29..da23763dc29 100644
--- a/crates/ide_db/src/assists.rs
+++ b/crates/ide-db/src/assists.rs
diff --git a/crates/ide_db/src/defs.rs b/crates/ide-db/src/defs.rs
index 34b557e21ea..34b557e21ea 100644
--- a/crates/ide_db/src/defs.rs
+++ b/crates/ide-db/src/defs.rs
diff --git a/crates/ide_db/src/famous_defs.rs b/crates/ide-db/src/famous_defs.rs
index f17fd0faa53..f17fd0faa53 100644
--- a/crates/ide_db/src/famous_defs.rs
+++ b/crates/ide-db/src/famous_defs.rs
diff --git a/crates/ide_db/src/generated/lints.rs b/crates/ide-db/src/generated/lints.rs
index 64dd2bb5f2d..64dd2bb5f2d 100644
--- a/crates/ide_db/src/generated/lints.rs
+++ b/crates/ide-db/src/generated/lints.rs
diff --git a/crates/ide_db/src/helpers.rs b/crates/ide-db/src/helpers.rs
index d4fda397d68..d4fda397d68 100644
--- a/crates/ide_db/src/helpers.rs
+++ b/crates/ide-db/src/helpers.rs
diff --git a/crates/ide_db/src/imports/import_assets.rs b/crates/ide-db/src/imports/import_assets.rs
index f8cfe15c896..f8cfe15c896 100644
--- a/crates/ide_db/src/imports/import_assets.rs
+++ b/crates/ide-db/src/imports/import_assets.rs
diff --git a/crates/ide_db/src/imports/insert_use.rs b/crates/ide-db/src/imports/insert_use.rs
index a19969ecc4a..a19969ecc4a 100644
--- a/crates/ide_db/src/imports/insert_use.rs
+++ b/crates/ide-db/src/imports/insert_use.rs
diff --git a/crates/ide_db/src/imports/insert_use/tests.rs b/crates/ide-db/src/imports/insert_use/tests.rs
index acadb353b6a..acadb353b6a 100644
--- a/crates/ide_db/src/imports/insert_use/tests.rs
+++ b/crates/ide-db/src/imports/insert_use/tests.rs
diff --git a/crates/ide_db/src/imports/merge_imports.rs b/crates/ide-db/src/imports/merge_imports.rs
index c7d9034f74d..c7d9034f74d 100644
--- a/crates/ide_db/src/imports/merge_imports.rs
+++ b/crates/ide-db/src/imports/merge_imports.rs
diff --git a/crates/ide_db/src/items_locator.rs b/crates/ide-db/src/items_locator.rs
index 07a57c883b2..07a57c883b2 100644
--- a/crates/ide_db/src/items_locator.rs
+++ b/crates/ide-db/src/items_locator.rs
diff --git a/crates/ide_db/src/label.rs b/crates/ide-db/src/label.rs
index 4b6d54b5eab..4b6d54b5eab 100644
--- a/crates/ide_db/src/label.rs
+++ b/crates/ide-db/src/label.rs
diff --git a/crates/ide_db/src/lib.rs b/crates/ide-db/src/lib.rs
index 8fad4ac0f3c..8fad4ac0f3c 100644
--- a/crates/ide_db/src/lib.rs
+++ b/crates/ide-db/src/lib.rs
diff --git a/crates/ide_db/src/line_index.rs b/crates/ide-db/src/line_index.rs
index 68ad07ee83f..68ad07ee83f 100644
--- a/crates/ide_db/src/line_index.rs
+++ b/crates/ide-db/src/line_index.rs
diff --git a/crates/ide_db/src/path_transform.rs b/crates/ide-db/src/path_transform.rs
index 61b2c3f3b8b..61b2c3f3b8b 100644
--- a/crates/ide_db/src/path_transform.rs
+++ b/crates/ide-db/src/path_transform.rs
diff --git a/crates/ide_db/src/rename.rs b/crates/ide-db/src/rename.rs
index 589975406a4..589975406a4 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide-db/src/rename.rs
diff --git a/crates/ide_db/src/rust_doc.rs b/crates/ide-db/src/rust_doc.rs
index e27e23867a8..e27e23867a8 100644
--- a/crates/ide_db/src/rust_doc.rs
+++ b/crates/ide-db/src/rust_doc.rs
diff --git a/crates/ide_db/src/search.rs b/crates/ide-db/src/search.rs
index e6bd46347d9..e6bd46347d9 100644
--- a/crates/ide_db/src/search.rs
+++ b/crates/ide-db/src/search.rs
diff --git a/crates/ide_db/src/source_change.rs b/crates/ide-db/src/source_change.rs
index 8132c73ef26..8132c73ef26 100644
--- a/crates/ide_db/src/source_change.rs
+++ b/crates/ide-db/src/source_change.rs
diff --git a/crates/ide_db/src/symbol_index.rs b/crates/ide-db/src/symbol_index.rs
index a812c838acc..a812c838acc 100644
--- a/crates/ide_db/src/symbol_index.rs
+++ b/crates/ide-db/src/symbol_index.rs
diff --git a/crates/ide_db/src/syntax_helpers/format_string.rs b/crates/ide-db/src/syntax_helpers/format_string.rs
index 3c584a6cbc9..3c584a6cbc9 100644
--- a/crates/ide_db/src/syntax_helpers/format_string.rs
+++ b/crates/ide-db/src/syntax_helpers/format_string.rs
diff --git a/crates/ide_db/src/syntax_helpers/insert_whitespace_into_node.rs b/crates/ide-db/src/syntax_helpers/insert_whitespace_into_node.rs
index e389eaf0478..e389eaf0478 100644
--- a/crates/ide_db/src/syntax_helpers/insert_whitespace_into_node.rs
+++ b/crates/ide-db/src/syntax_helpers/insert_whitespace_into_node.rs
diff --git a/crates/ide_db/src/syntax_helpers/node_ext.rs b/crates/ide-db/src/syntax_helpers/node_ext.rs
index f011a4a48a3..f011a4a48a3 100644
--- a/crates/ide_db/src/syntax_helpers/node_ext.rs
+++ b/crates/ide-db/src/syntax_helpers/node_ext.rs
diff --git a/crates/ide_db/src/test_data/test_symbol_index_collection.txt b/crates/ide-db/src/test_data/test_symbol_index_collection.txt
index 2f531ca0c70..2f531ca0c70 100644
--- a/crates/ide_db/src/test_data/test_symbol_index_collection.txt
+++ b/crates/ide-db/src/test_data/test_symbol_index_collection.txt
diff --git a/crates/ide_db/src/tests/sourcegen_lints.rs b/crates/ide-db/src/tests/sourcegen_lints.rs
index b7db1dd8dbc..b7db1dd8dbc 100644
--- a/crates/ide_db/src/tests/sourcegen_lints.rs
+++ b/crates/ide-db/src/tests/sourcegen_lints.rs
diff --git a/crates/ide_db/src/traits.rs b/crates/ide-db/src/traits.rs
index 0fbfd869921..0fbfd869921 100644
--- a/crates/ide_db/src/traits.rs
+++ b/crates/ide-db/src/traits.rs
diff --git a/crates/ide_db/src/ty_filter.rs b/crates/ide-db/src/ty_filter.rs
index 2c6b00b1343..2c6b00b1343 100644
--- a/crates/ide_db/src/ty_filter.rs
+++ b/crates/ide-db/src/ty_filter.rs
diff --git a/crates/ide_diagnostics/Cargo.toml b/crates/ide-diagnostics/Cargo.toml
index 20bd4a2ed24..f59da69dfb1 100644
--- a/crates/ide_diagnostics/Cargo.toml
+++ b/crates/ide-diagnostics/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ide_diagnostics"
+name = "ide-diagnostics"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
@@ -19,13 +19,13 @@ either = "1.6.1"
 profile = { path = "../profile", version = "0.0.0" }
 stdx = { path = "../stdx", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
-text_edit = { path = "../text_edit", version = "0.0.0" }
+text-edit = { path = "../text-edit", version = "0.0.0" }
 cfg = { path = "../cfg", version = "0.0.0" }
 hir = { path = "../hir", version = "0.0.0" }
-ide_db = { path = "../ide_db", version = "0.0.0" }
+ide-db = { path = "../ide-db", version = "0.0.0" }
 
 [dev-dependencies]
 expect-test = "1.2.2"
 
-test_utils = { path = "../test_utils" }
+test-utils = { path = "../test-utils" }
 sourcegen = { path = "../sourcegen" }
diff --git a/crates/ide_diagnostics/src/handlers/break_outside_of_loop.rs b/crates/ide-diagnostics/src/handlers/break_outside_of_loop.rs
index d12594a4ce5..d12594a4ce5 100644
--- a/crates/ide_diagnostics/src/handlers/break_outside_of_loop.rs
+++ b/crates/ide-diagnostics/src/handlers/break_outside_of_loop.rs
diff --git a/crates/ide_diagnostics/src/handlers/field_shorthand.rs b/crates/ide-diagnostics/src/handlers/field_shorthand.rs
index 2b710536250..2b710536250 100644
--- a/crates/ide_diagnostics/src/handlers/field_shorthand.rs
+++ b/crates/ide-diagnostics/src/handlers/field_shorthand.rs
diff --git a/crates/ide_diagnostics/src/handlers/inactive_code.rs b/crates/ide-diagnostics/src/handlers/inactive_code.rs
index 155bbc569d0..155bbc569d0 100644
--- a/crates/ide_diagnostics/src/handlers/inactive_code.rs
+++ b/crates/ide-diagnostics/src/handlers/inactive_code.rs
diff --git a/crates/ide_diagnostics/src/handlers/incorrect_case.rs b/crates/ide-diagnostics/src/handlers/incorrect_case.rs
index 6a78c08d44c..6a78c08d44c 100644
--- a/crates/ide_diagnostics/src/handlers/incorrect_case.rs
+++ b/crates/ide-diagnostics/src/handlers/incorrect_case.rs
diff --git a/crates/ide_diagnostics/src/handlers/invalid_derive_target.rs b/crates/ide-diagnostics/src/handlers/invalid_derive_target.rs
index c779266bc97..c779266bc97 100644
--- a/crates/ide_diagnostics/src/handlers/invalid_derive_target.rs
+++ b/crates/ide-diagnostics/src/handlers/invalid_derive_target.rs
diff --git a/crates/ide_diagnostics/src/handlers/macro_error.rs b/crates/ide-diagnostics/src/handlers/macro_error.rs
index a5bfb302d5e..a5bfb302d5e 100644
--- a/crates/ide_diagnostics/src/handlers/macro_error.rs
+++ b/crates/ide-diagnostics/src/handlers/macro_error.rs
diff --git a/crates/ide_diagnostics/src/handlers/malformed_derive.rs b/crates/ide-diagnostics/src/handlers/malformed_derive.rs
index cd48bdba07e..cd48bdba07e 100644
--- a/crates/ide_diagnostics/src/handlers/malformed_derive.rs
+++ b/crates/ide-diagnostics/src/handlers/malformed_derive.rs
diff --git a/crates/ide_diagnostics/src/handlers/mismatched_arg_count.rs b/crates/ide-diagnostics/src/handlers/mismatched_arg_count.rs
index 95a3ac1d519..95a3ac1d519 100644
--- a/crates/ide_diagnostics/src/handlers/mismatched_arg_count.rs
+++ b/crates/ide-diagnostics/src/handlers/mismatched_arg_count.rs
diff --git a/crates/ide_diagnostics/src/handlers/missing_fields.rs b/crates/ide-diagnostics/src/handlers/missing_fields.rs
index 3160004380f..3160004380f 100644
--- a/crates/ide_diagnostics/src/handlers/missing_fields.rs
+++ b/crates/ide-diagnostics/src/handlers/missing_fields.rs
diff --git a/crates/ide_diagnostics/src/handlers/missing_match_arms.rs b/crates/ide-diagnostics/src/handlers/missing_match_arms.rs
index 3eb4cf60a96..3eb4cf60a96 100644
--- a/crates/ide_diagnostics/src/handlers/missing_match_arms.rs
+++ b/crates/ide-diagnostics/src/handlers/missing_match_arms.rs
diff --git a/crates/ide_diagnostics/src/handlers/missing_unsafe.rs b/crates/ide-diagnostics/src/handlers/missing_unsafe.rs
index 7acd9228a89..7acd9228a89 100644
--- a/crates/ide_diagnostics/src/handlers/missing_unsafe.rs
+++ b/crates/ide-diagnostics/src/handlers/missing_unsafe.rs
diff --git a/crates/ide_diagnostics/src/handlers/no_such_field.rs b/crates/ide-diagnostics/src/handlers/no_such_field.rs
index 667a550d1f9..667a550d1f9 100644
--- a/crates/ide_diagnostics/src/handlers/no_such_field.rs
+++ b/crates/ide-diagnostics/src/handlers/no_such_field.rs
diff --git a/crates/ide_diagnostics/src/handlers/replace_filter_map_next_with_find_map.rs b/crates/ide-diagnostics/src/handlers/replace_filter_map_next_with_find_map.rs
index 9826e1c707e..9826e1c707e 100644
--- a/crates/ide_diagnostics/src/handlers/replace_filter_map_next_with_find_map.rs
+++ b/crates/ide-diagnostics/src/handlers/replace_filter_map_next_with_find_map.rs
diff --git a/crates/ide_diagnostics/src/handlers/type_mismatch.rs b/crates/ide-diagnostics/src/handlers/type_mismatch.rs
index 442268d1352..442268d1352 100644
--- a/crates/ide_diagnostics/src/handlers/type_mismatch.rs
+++ b/crates/ide-diagnostics/src/handlers/type_mismatch.rs
diff --git a/crates/ide_diagnostics/src/handlers/unimplemented_builtin_macro.rs b/crates/ide-diagnostics/src/handlers/unimplemented_builtin_macro.rs
index e879de75cd8..e879de75cd8 100644
--- a/crates/ide_diagnostics/src/handlers/unimplemented_builtin_macro.rs
+++ b/crates/ide-diagnostics/src/handlers/unimplemented_builtin_macro.rs
diff --git a/crates/ide_diagnostics/src/handlers/unlinked_file.rs b/crates/ide-diagnostics/src/handlers/unlinked_file.rs
index 9d46e2b0785..9d46e2b0785 100644
--- a/crates/ide_diagnostics/src/handlers/unlinked_file.rs
+++ b/crates/ide-diagnostics/src/handlers/unlinked_file.rs
diff --git a/crates/ide_diagnostics/src/handlers/unresolved_extern_crate.rs b/crates/ide-diagnostics/src/handlers/unresolved_extern_crate.rs
index 74e4a69c64b..74e4a69c64b 100644
--- a/crates/ide_diagnostics/src/handlers/unresolved_extern_crate.rs
+++ b/crates/ide-diagnostics/src/handlers/unresolved_extern_crate.rs
diff --git a/crates/ide_diagnostics/src/handlers/unresolved_import.rs b/crates/ide-diagnostics/src/handlers/unresolved_import.rs
index e52a88459d5..e52a88459d5 100644
--- a/crates/ide_diagnostics/src/handlers/unresolved_import.rs
+++ b/crates/ide-diagnostics/src/handlers/unresolved_import.rs
diff --git a/crates/ide_diagnostics/src/handlers/unresolved_macro_call.rs b/crates/ide-diagnostics/src/handlers/unresolved_macro_call.rs
index 831d082bc7e..831d082bc7e 100644
--- a/crates/ide_diagnostics/src/handlers/unresolved_macro_call.rs
+++ b/crates/ide-diagnostics/src/handlers/unresolved_macro_call.rs
diff --git a/crates/ide_diagnostics/src/handlers/unresolved_module.rs b/crates/ide-diagnostics/src/handlers/unresolved_module.rs
index b8f2a9e94a4..b8f2a9e94a4 100644
--- a/crates/ide_diagnostics/src/handlers/unresolved_module.rs
+++ b/crates/ide-diagnostics/src/handlers/unresolved_module.rs
diff --git a/crates/ide_diagnostics/src/handlers/unresolved_proc_macro.rs b/crates/ide-diagnostics/src/handlers/unresolved_proc_macro.rs
index fde1d1323f5..fde1d1323f5 100644
--- a/crates/ide_diagnostics/src/handlers/unresolved_proc_macro.rs
+++ b/crates/ide-diagnostics/src/handlers/unresolved_proc_macro.rs
diff --git a/crates/ide_diagnostics/src/handlers/useless_braces.rs b/crates/ide-diagnostics/src/handlers/useless_braces.rs
index 8b9330e0401..8b9330e0401 100644
--- a/crates/ide_diagnostics/src/handlers/useless_braces.rs
+++ b/crates/ide-diagnostics/src/handlers/useless_braces.rs
diff --git a/crates/ide_diagnostics/src/lib.rs b/crates/ide-diagnostics/src/lib.rs
index 1d4ea461d08..1d4ea461d08 100644
--- a/crates/ide_diagnostics/src/lib.rs
+++ b/crates/ide-diagnostics/src/lib.rs
diff --git a/crates/ide_diagnostics/src/tests.rs b/crates/ide-diagnostics/src/tests.rs
index 7cd79c7ceef..7cd79c7ceef 100644
--- a/crates/ide_diagnostics/src/tests.rs
+++ b/crates/ide-diagnostics/src/tests.rs
diff --git a/crates/ide_diagnostics/src/tests/sourcegen.rs b/crates/ide-diagnostics/src/tests/sourcegen.rs
index f36959fb5c3..ec6558a46ef 100644
--- a/crates/ide_diagnostics/src/tests/sourcegen.rs
+++ b/crates/ide-diagnostics/src/tests/sourcegen.rs
@@ -23,7 +23,7 @@ struct Diagnostic {
 
 impl Diagnostic {
     fn collect() -> io::Result<Vec<Diagnostic>> {
-        let handlers_dir = project_root().join("crates/ide_diagnostics/src/handlers");
+        let handlers_dir = project_root().join("crates/ide-diagnostics/src/handlers");
 
         let mut res = Vec::new();
         for path in sourcegen::list_rust_files(&handlers_dir) {
diff --git a/crates/ide_ssr/Cargo.toml b/crates/ide-ssr/Cargo.toml
index a736b900ecb..a6ffa51b4e0 100644
--- a/crates/ide_ssr/Cargo.toml
+++ b/crates/ide-ssr/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "ide_ssr"
+name = "ide-ssr"
 version = "0.0.0"
 description = "Structural search and replace of Rust code"
 license = "MIT OR Apache-2.0"
@@ -15,12 +15,12 @@ cov-mark = "2.0.0-pre.1"
 
 itertools = "0.10.3"
 
-text_edit = { path = "../text_edit", version = "0.0.0" }
+text-edit = { path = "../text-edit", version = "0.0.0" }
 parser = { path = "../parser", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
-ide_db = { path = "../ide_db", version = "0.0.0" }
+ide-db = { path = "../ide-db", version = "0.0.0" }
 hir = { path = "../hir", version = "0.0.0" }
 
 [dev-dependencies]
-test_utils = { path = "../test_utils" }
+test-utils = { path = "../test-utils" }
 expect-test = "1.2.2"
diff --git a/crates/ide_ssr/src/errors.rs b/crates/ide-ssr/src/errors.rs
index c02bacae6bf..c02bacae6bf 100644
--- a/crates/ide_ssr/src/errors.rs
+++ b/crates/ide-ssr/src/errors.rs
diff --git a/crates/ide_ssr/src/fragments.rs b/crates/ide-ssr/src/fragments.rs
index 503754afe7c..503754afe7c 100644
--- a/crates/ide_ssr/src/fragments.rs
+++ b/crates/ide-ssr/src/fragments.rs
diff --git a/crates/ide_ssr/src/from_comment.rs b/crates/ide-ssr/src/from_comment.rs
index c50e74d93a4..c50e74d93a4 100644
--- a/crates/ide_ssr/src/from_comment.rs
+++ b/crates/ide-ssr/src/from_comment.rs
diff --git a/crates/ide_ssr/src/lib.rs b/crates/ide-ssr/src/lib.rs
index 7b4e53ed24a..7b4e53ed24a 100644
--- a/crates/ide_ssr/src/lib.rs
+++ b/crates/ide-ssr/src/lib.rs
diff --git a/crates/ide_ssr/src/matching.rs b/crates/ide-ssr/src/matching.rs
index ba2a99c5d41..ba2a99c5d41 100644
--- a/crates/ide_ssr/src/matching.rs
+++ b/crates/ide-ssr/src/matching.rs
diff --git a/crates/ide_ssr/src/nester.rs b/crates/ide-ssr/src/nester.rs
index 0c1b2685b20..0c1b2685b20 100644
--- a/crates/ide_ssr/src/nester.rs
+++ b/crates/ide-ssr/src/nester.rs
diff --git a/crates/ide_ssr/src/parsing.rs b/crates/ide-ssr/src/parsing.rs
index f6220b928a4..f6220b928a4 100644
--- a/crates/ide_ssr/src/parsing.rs
+++ b/crates/ide-ssr/src/parsing.rs
diff --git a/crates/ide_ssr/src/replacing.rs b/crates/ide-ssr/src/replacing.rs
index 1726d5701a4..1726d5701a4 100644
--- a/crates/ide_ssr/src/replacing.rs
+++ b/crates/ide-ssr/src/replacing.rs
diff --git a/crates/ide_ssr/src/resolving.rs b/crates/ide-ssr/src/resolving.rs
index d46ca05e558..d46ca05e558 100644
--- a/crates/ide_ssr/src/resolving.rs
+++ b/crates/ide-ssr/src/resolving.rs
diff --git a/crates/ide_ssr/src/search.rs b/crates/ide-ssr/src/search.rs
index 0a85569b600..0a85569b600 100644
--- a/crates/ide_ssr/src/search.rs
+++ b/crates/ide-ssr/src/search.rs
diff --git a/crates/ide_ssr/src/tests.rs b/crates/ide-ssr/src/tests.rs
index e86190564cf..e86190564cf 100644
--- a/crates/ide_ssr/src/tests.rs
+++ b/crates/ide-ssr/src/tests.rs
diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml
index f8bb1e4c015..23cd0f64433 100644
--- a/crates/ide/Cargo.toml
+++ b/crates/ide/Cargo.toml
@@ -23,22 +23,22 @@ dot = "0.1.4"
 
 stdx = { path = "../stdx", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
-text_edit = { path = "../text_edit", version = "0.0.0" }
-ide_db = { path = "../ide_db", version = "0.0.0" }
+text-edit = { path = "../text-edit", version = "0.0.0" }
+ide-db = { path = "../ide-db", version = "0.0.0" }
 cfg = { path = "../cfg", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
-ide_assists = { path = "../ide_assists", version = "0.0.0" }
-ide_diagnostics = { path = "../ide_diagnostics", version = "0.0.0" }
-ide_ssr = { path = "../ide_ssr", version = "0.0.0" }
-ide_completion = { path = "../ide_completion", version = "0.0.0" }
+ide-assists = { path = "../ide-assists", version = "0.0.0" }
+ide-diagnostics = { path = "../ide-diagnostics", version = "0.0.0" }
+ide-ssr = { path = "../ide-ssr", version = "0.0.0" }
+ide-completion = { path = "../ide-completion", version = "0.0.0" }
 
 # ide should depend only on the top-level `hir` package. if you need
-# something from some `hir_xxx` subpackage, reexport the API via `hir`.
+# something from some `hir-xxx` subpackage, reexport the API via `hir`.
 hir = { path = "../hir", version = "0.0.0" }
 
 [target.'cfg(not(any(target_arch = "wasm32", target_os = "emscripten")))'.dependencies]
 toolchain = { path = "../toolchain", version = "0.0.0" }
 
 [dev-dependencies]
-test_utils = { path = "../test_utils" }
+test-utils = { path = "../test-utils" }
 expect-test = "1.2.2"
diff --git a/crates/mbe/Cargo.toml b/crates/mbe/Cargo.toml
index 1453ec4c690..d6d15dd19d8 100644
--- a/crates/mbe/Cargo.toml
+++ b/crates/mbe/Cargo.toml
@@ -21,4 +21,4 @@ tt = { path = "../tt", version = "0.0.0" }
 stdx = { path = "../stdx", version = "0.0.0" }
 
 [dev-dependencies]
-test_utils = { path = "../test_utils" }
+test-utils = { path = "../test-utils" }
diff --git a/crates/proc_macro_api/Cargo.toml b/crates/proc-macro-api/Cargo.toml
index 000c23dab61..df2cbcaf307 100644
--- a/crates/proc_macro_api/Cargo.toml
+++ b/crates/proc-macro-api/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "proc_macro_api"
+name = "proc-macro-api"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
@@ -28,4 +28,4 @@ tt = { path = "../tt", version = "0.0.0" }
 stdx = { path = "../stdx", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
 # Intentionally *not* depend on anything salsa-related
-# base_db = { path = "../base_db", version = "0.0.0" }
+# base-db = { path = "../base-db", version = "0.0.0" }
diff --git a/crates/proc_macro_api/src/lib.rs b/crates/proc-macro-api/src/lib.rs
index eb7a28b972b..eb7a28b972b 100644
--- a/crates/proc_macro_api/src/lib.rs
+++ b/crates/proc-macro-api/src/lib.rs
diff --git a/crates/proc_macro_api/src/msg.rs b/crates/proc-macro-api/src/msg.rs
index f9c2b9fda3a..f9c2b9fda3a 100644
--- a/crates/proc_macro_api/src/msg.rs
+++ b/crates/proc-macro-api/src/msg.rs
diff --git a/crates/proc_macro_api/src/msg/flat.rs b/crates/proc-macro-api/src/msg/flat.rs
index 8437444e183..8437444e183 100644
--- a/crates/proc_macro_api/src/msg/flat.rs
+++ b/crates/proc-macro-api/src/msg/flat.rs
diff --git a/crates/proc_macro_api/src/process.rs b/crates/proc-macro-api/src/process.rs
index ff4c59447d8..ff4c59447d8 100644
--- a/crates/proc_macro_api/src/process.rs
+++ b/crates/proc-macro-api/src/process.rs
diff --git a/crates/proc_macro_api/src/version.rs b/crates/proc-macro-api/src/version.rs
index f29970d477c..f29970d477c 100644
--- a/crates/proc_macro_api/src/version.rs
+++ b/crates/proc-macro-api/src/version.rs
diff --git a/crates/proc_macro_srv/Cargo.toml b/crates/proc-macro-srv/Cargo.toml
index 381d241b86a..01bc8878bb1 100644
--- a/crates/proc_macro_srv/Cargo.toml
+++ b/crates/proc-macro-srv/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "proc_macro_srv"
+name = "proc-macro-srv"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
@@ -23,10 +23,10 @@ memmap2 = "0.5.3"
 tt = { path = "../tt", version = "0.0.0" }
 mbe = { path = "../mbe", version = "0.0.0" }
 paths = { path = "../paths", version = "0.0.0" }
-proc_macro_api = { path = "../proc_macro_api", version = "0.0.0" }
+proc-macro-api = { path = "../proc-macro-api", version = "0.0.0" }
 
 [dev-dependencies]
 expect-test = "1.2.2"
 
 # used as proc macro test targets
-proc_macro_test = { path = "../proc_macro_test" }
+proc-macro-test = { path = "../proc-macro-test" }
diff --git a/crates/proc_macro_srv/src/abis/abi_1_48/mod.rs b/crates/proc-macro-srv/src/abis/abi_1_48/mod.rs
index 00c984e0b40..00c984e0b40 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_48/mod.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_48/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/buffer.rs b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/buffer.rs
index 3b2afe01f5b..3b2afe01f5b 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/buffer.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/buffer.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/client.rs b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/client.rs
index 9f74fb06689..9f74fb06689 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/client.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/client.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/closure.rs b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/closure.rs
index f5b6d897e43..f5b6d897e43 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/closure.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/closure.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/handle.rs b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/handle.rs
index d2a65d249b5..d2a65d249b5 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/handle.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/handle.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/mod.rs b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/mod.rs
index be5402d6eed..be5402d6eed 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/mod.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/rpc.rs b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/rpc.rs
index 69928ec845a..69928ec845a 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/rpc.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/rpc.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/scoped_cell.rs b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/scoped_cell.rs
index 0436bc41836..0436bc41836 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/scoped_cell.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/scoped_cell.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/server.rs b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/server.rs
index a580419fd13..a580419fd13 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/bridge/server.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/bridge/server.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/diagnostic.rs b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/diagnostic.rs
index 6953b1ecf4c..6953b1ecf4c 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/diagnostic.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/diagnostic.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/mod.rs b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/mod.rs
index aaa71037567..aaa71037567 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_48/proc_macro/mod.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_48/proc_macro/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_48/rustc_server.rs b/crates/proc-macro-srv/src/abis/abi_1_48/rustc_server.rs
index 4dc506e0f19..4dc506e0f19 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_48/rustc_server.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_48/rustc_server.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_54/mod.rs b/crates/proc-macro-srv/src/abis/abi_1_54/mod.rs
index 81c55cf10c7..81c55cf10c7 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_54/mod.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_54/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/buffer.rs b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/buffer.rs
index 1565db187c6..1565db187c6 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/buffer.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/buffer.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/client.rs b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/client.rs
index 9f74fb06689..9f74fb06689 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/client.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/client.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/closure.rs b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/closure.rs
index f5b6d897e43..f5b6d897e43 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/closure.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/closure.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/handle.rs b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/handle.rs
index d2a65d249b5..d2a65d249b5 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/handle.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/handle.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/mod.rs b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/mod.rs
index 8d97bddfd38..8d97bddfd38 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/mod.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/rpc.rs b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/rpc.rs
index 69928ec845a..69928ec845a 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/rpc.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/rpc.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/scoped_cell.rs b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/scoped_cell.rs
index 0436bc41836..0436bc41836 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/scoped_cell.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/scoped_cell.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/server.rs b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/server.rs
index 21563fe6049..21563fe6049 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/bridge/server.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/bridge/server.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/diagnostic.rs b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/diagnostic.rs
index 6953b1ecf4c..6953b1ecf4c 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/diagnostic.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/diagnostic.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/mod.rs b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/mod.rs
index 5814267cfc5..5814267cfc5 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_54/proc_macro/mod.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_54/proc_macro/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_54/rustc_server.rs b/crates/proc-macro-srv/src/abis/abi_1_54/rustc_server.rs
index 7b333836b11..7b333836b11 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_54/rustc_server.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_54/rustc_server.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_56/mod.rs b/crates/proc-macro-srv/src/abis/abi_1_56/mod.rs
index ee1c2d4553a..ee1c2d4553a 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_56/mod.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_56/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/buffer.rs b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/buffer.rs
index d82669d3e23..d82669d3e23 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/buffer.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/buffer.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/client.rs b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/client.rs
index ed0e91da361..ed0e91da361 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/client.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/client.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/closure.rs b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/closure.rs
index 5be71cc3d70..5be71cc3d70 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/closure.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/closure.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/handle.rs b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/handle.rs
index bcbb8681247..bcbb8681247 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/handle.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/handle.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/mod.rs b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/mod.rs
index fc20f7df665..fc20f7df665 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/mod.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/rpc.rs b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/rpc.rs
index d50564d01a5..d50564d01a5 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/rpc.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/rpc.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/scoped_cell.rs b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/scoped_cell.rs
index b0c2e5b9c26..b0c2e5b9c26 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/scoped_cell.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/scoped_cell.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/server.rs b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/server.rs
index 06a19791351..06a19791351 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/bridge/server.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/bridge/server.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/diagnostic.rs b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/diagnostic.rs
index 6953b1ecf4c..6953b1ecf4c 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/diagnostic.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/diagnostic.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/mod.rs b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/mod.rs
index 86657442c06..86657442c06 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/mod.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/quote.rs b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/quote.rs
index 53e821c0f2f..53e821c0f2f 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_56/proc_macro/quote.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_56/proc_macro/quote.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_56/rustc_server.rs b/crates/proc-macro-srv/src/abis/abi_1_56/rustc_server.rs
index 8517eddf991..8517eddf991 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_56/rustc_server.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_56/rustc_server.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_57/mod.rs b/crates/proc-macro-srv/src/abis/abi_1_57/mod.rs
index 59e1a4bf903..59e1a4bf903 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_57/mod.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_57/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/buffer.rs b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/buffer.rs
index d82669d3e23..d82669d3e23 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/buffer.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/buffer.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/client.rs b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/client.rs
index ed0e91da361..ed0e91da361 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/client.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/client.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/closure.rs b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/closure.rs
index 5be71cc3d70..5be71cc3d70 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/closure.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/closure.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/handle.rs b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/handle.rs
index bcbb8681247..bcbb8681247 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/handle.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/handle.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/mod.rs b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/mod.rs
index 16a6f7e4e1a..16a6f7e4e1a 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/mod.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/rpc.rs b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/rpc.rs
index d50564d01a5..d50564d01a5 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/rpc.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/rpc.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/scoped_cell.rs b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/scoped_cell.rs
index b0c2e5b9c26..b0c2e5b9c26 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/scoped_cell.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/scoped_cell.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/server.rs b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/server.rs
index 06a19791351..06a19791351 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/bridge/server.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/bridge/server.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/diagnostic.rs b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/diagnostic.rs
index cda239f8785..cda239f8785 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/diagnostic.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/diagnostic.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/mod.rs b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/mod.rs
index 9bbc44649fd..9bbc44649fd 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/mod.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/quote.rs b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/quote.rs
index b539ab9c0c6..b539ab9c0c6 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_57/proc_macro/quote.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_57/proc_macro/quote.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_57/rustc_server.rs b/crates/proc-macro-srv/src/abis/abi_1_57/rustc_server.rs
index 48597e894c6..48597e894c6 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_57/rustc_server.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_57/rustc_server.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_58/mod.rs b/crates/proc-macro-srv/src/abis/abi_1_58/mod.rs
index dd3fd8b6422..dd3fd8b6422 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_58/mod.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_58/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/buffer.rs b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/buffer.rs
index d82669d3e23..d82669d3e23 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/buffer.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/buffer.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/client.rs b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/client.rs
index ed0e91da361..ed0e91da361 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/client.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/client.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/closure.rs b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/closure.rs
index 5be71cc3d70..5be71cc3d70 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/closure.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/closure.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/handle.rs b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/handle.rs
index bcbb8681247..bcbb8681247 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/handle.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/handle.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/mod.rs b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/mod.rs
index b7968c529c3..b7968c529c3 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/mod.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/rpc.rs b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/rpc.rs
index d50564d01a5..d50564d01a5 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/rpc.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/rpc.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/scoped_cell.rs b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/scoped_cell.rs
index b0c2e5b9c26..b0c2e5b9c26 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/scoped_cell.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/scoped_cell.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/server.rs b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/server.rs
index 06a19791351..06a19791351 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/bridge/server.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/bridge/server.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/diagnostic.rs b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/diagnostic.rs
index cda239f8785..cda239f8785 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/diagnostic.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/diagnostic.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/mod.rs b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/mod.rs
index 4a07f22779e..4a07f22779e 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/mod.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/mod.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/quote.rs b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/quote.rs
index b539ab9c0c6..b539ab9c0c6 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_58/proc_macro/quote.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_58/proc_macro/quote.rs
diff --git a/crates/proc_macro_srv/src/abis/abi_1_58/rustc_server.rs b/crates/proc-macro-srv/src/abis/abi_1_58/rustc_server.rs
index 5c596bc0e62..5c596bc0e62 100644
--- a/crates/proc_macro_srv/src/abis/abi_1_58/rustc_server.rs
+++ b/crates/proc-macro-srv/src/abis/abi_1_58/rustc_server.rs
diff --git a/crates/proc_macro_srv/src/abis/mod.rs b/crates/proc-macro-srv/src/abis/mod.rs
index 87fca8caab2..87fca8caab2 100644
--- a/crates/proc_macro_srv/src/abis/mod.rs
+++ b/crates/proc-macro-srv/src/abis/mod.rs
diff --git a/crates/proc_macro_srv/src/cli.rs b/crates/proc-macro-srv/src/cli.rs
index f1e131c135d..f1e131c135d 100644
--- a/crates/proc_macro_srv/src/cli.rs
+++ b/crates/proc-macro-srv/src/cli.rs
diff --git a/crates/proc_macro_srv/src/dylib.rs b/crates/proc-macro-srv/src/dylib.rs
index 2b6c070fece..2b6c070fece 100644
--- a/crates/proc_macro_srv/src/dylib.rs
+++ b/crates/proc-macro-srv/src/dylib.rs
diff --git a/crates/proc_macro_srv/src/lib.rs b/crates/proc-macro-srv/src/lib.rs
index 52693547e59..52693547e59 100644
--- a/crates/proc_macro_srv/src/lib.rs
+++ b/crates/proc-macro-srv/src/lib.rs
diff --git a/crates/proc_macro_srv/src/tests/mod.rs b/crates/proc-macro-srv/src/tests/mod.rs
index 9356e6dcb01..9356e6dcb01 100644
--- a/crates/proc_macro_srv/src/tests/mod.rs
+++ b/crates/proc-macro-srv/src/tests/mod.rs
diff --git a/crates/proc_macro_srv/src/tests/utils.rs b/crates/proc-macro-srv/src/tests/utils.rs
index d1f492ee8f7..d1f492ee8f7 100644
--- a/crates/proc_macro_srv/src/tests/utils.rs
+++ b/crates/proc-macro-srv/src/tests/utils.rs
diff --git a/crates/proc_macro_test/Cargo.toml b/crates/proc-macro-test/Cargo.toml
index d0ddbd6d592..872b2a99d84 100644
--- a/crates/proc_macro_test/Cargo.toml
+++ b/crates/proc-macro-test/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "proc_macro_test"
+name = "proc-macro-test"
 version = "0.0.0"
 license = "MIT OR Apache-2.0"
 edition = "2021"
@@ -10,6 +10,6 @@ publish = false
 doctest = false
 
 [build-dependencies]
-proc_macro_test_impl = { path = "imp", version = "0.0.0" }
+proc-macro-test-impl = { path = "imp", version = "0.0.0" }
 toolchain = { path = "../toolchain", version = "0.0.0" }
 cargo_metadata = "0.14.2"
diff --git a/crates/proc_macro_test/build.rs b/crates/proc-macro-test/build.rs
index 1e7aa026fa5..767a790437e 100644
--- a/crates/proc_macro_test/build.rs
+++ b/crates/proc-macro-test/build.rs
@@ -1,7 +1,7 @@
 //! This will build the proc macro in `imp`, and copy the resulting dylib artifact into the
 //! `OUT_DIR`.
 //!
-//! `proc_macro_test` itself contains only a path to that artifact.
+//! `proc-macro-test` itself contains only a path to that artifact.
 
 use std::{
     env, fs,
@@ -15,12 +15,12 @@ fn main() {
     let out_dir = env::var_os("OUT_DIR").unwrap();
     let out_dir = Path::new(&out_dir);
 
-    let name = "proc_macro_test_impl";
+    let name = "proc-macro-test-impl";
     let version = "0.0.0";
     let target_dir = out_dir.join("target");
     let output = Command::new(toolchain::cargo())
         .current_dir("imp")
-        .args(&["build", "-p", "proc_macro_test_impl", "--message-format", "json"])
+        .args(&["build", "-p", "proc-macro-test-impl", "--message-format", "json"])
         // Explicit override the target directory to avoid using the same one which the parent
         // cargo is using, or we'll deadlock.
         // This can happen when `CARGO_TARGET_DIR` is set or global config forces all cargo
@@ -47,7 +47,7 @@ fn main() {
     }
 
     // This file is under `target_dir` and is already under `OUT_DIR`.
-    let artifact_path = artifact_path.expect("no dylib for proc_macro_test_impl found");
+    let artifact_path = artifact_path.expect("no dylib for proc-macro-test-impl found");
 
     let info_path = out_dir.join("proc_macro_test_location.txt");
     fs::write(info_path, artifact_path.to_str().unwrap()).unwrap();
diff --git a/crates/proc_macro_test/imp/.gitignore b/crates/proc-macro-test/imp/.gitignore
index 2c96eb1b651..2c96eb1b651 100644
--- a/crates/proc_macro_test/imp/.gitignore
+++ b/crates/proc-macro-test/imp/.gitignore
diff --git a/crates/proc_macro_test/imp/Cargo.toml b/crates/proc-macro-test/imp/Cargo.toml
index dfb71ce57d3..2d1fc3c5c7a 100644
--- a/crates/proc_macro_test/imp/Cargo.toml
+++ b/crates/proc-macro-test/imp/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "proc_macro_test_impl"
+name = "proc-macro-test-impl"
 version = "0.0.0"
 license = "MIT OR Apache-2.0"
 edition = "2021"
diff --git a/crates/proc_macro_test/imp/src/lib.rs b/crates/proc-macro-test/imp/src/lib.rs
index 980187a902f..980187a902f 100644
--- a/crates/proc_macro_test/imp/src/lib.rs
+++ b/crates/proc-macro-test/imp/src/lib.rs
diff --git a/crates/proc_macro_test/src/lib.rs b/crates/proc-macro-test/src/lib.rs
index 2edf23a6344..2edf23a6344 100644
--- a/crates/proc_macro_test/src/lib.rs
+++ b/crates/proc-macro-test/src/lib.rs
diff --git a/crates/project_model/Cargo.toml b/crates/project-model/Cargo.toml
index abb21586dae..8fafdb18506 100644
--- a/crates/project_model/Cargo.toml
+++ b/crates/project-model/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "project_model"
+name = "project-model"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
@@ -21,7 +21,7 @@ expect-test = "1.2.2"
 la-arena = { version = "0.3.0", path = "../../lib/arena" }
 
 cfg = { path = "../cfg", version = "0.0.0" }
-base_db = { path = "../base_db", version = "0.0.0" }
+base-db = { path = "../base-db", version = "0.0.0" }
 toolchain = { path = "../toolchain", version = "0.0.0" }
 paths = { path = "../paths", version = "0.0.0" }
 stdx = { path = "../stdx", version = "0.0.0" }
diff --git a/crates/project_model/src/build_scripts.rs b/crates/project-model/src/build_scripts.rs
index 5aa23331a13..5aa23331a13 100644
--- a/crates/project_model/src/build_scripts.rs
+++ b/crates/project-model/src/build_scripts.rs
diff --git a/crates/project_model/src/cargo_workspace.rs b/crates/project-model/src/cargo_workspace.rs
index 76ef44e1471..76ef44e1471 100644
--- a/crates/project_model/src/cargo_workspace.rs
+++ b/crates/project-model/src/cargo_workspace.rs
diff --git a/crates/project_model/src/cfg_flag.rs b/crates/project-model/src/cfg_flag.rs
index f3dd8f51333..f3dd8f51333 100644
--- a/crates/project_model/src/cfg_flag.rs
+++ b/crates/project-model/src/cfg_flag.rs
diff --git a/crates/project_model/src/lib.rs b/crates/project-model/src/lib.rs
index 1caf6b59bcd..1caf6b59bcd 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project-model/src/lib.rs
diff --git a/crates/project_model/src/manifest_path.rs b/crates/project-model/src/manifest_path.rs
index 4910fd3d11c..4910fd3d11c 100644
--- a/crates/project_model/src/manifest_path.rs
+++ b/crates/project-model/src/manifest_path.rs
diff --git a/crates/project_model/src/project_json.rs b/crates/project-model/src/project_json.rs
index a3c5ac16740..a3c5ac16740 100644
--- a/crates/project_model/src/project_json.rs
+++ b/crates/project-model/src/project_json.rs
diff --git a/crates/project_model/src/rustc_cfg.rs b/crates/project-model/src/rustc_cfg.rs
index 17e244d0649..17e244d0649 100644
--- a/crates/project_model/src/rustc_cfg.rs
+++ b/crates/project-model/src/rustc_cfg.rs
diff --git a/crates/project_model/src/sysroot.rs b/crates/project-model/src/sysroot.rs
index 52750f48969..52750f48969 100644
--- a/crates/project_model/src/sysroot.rs
+++ b/crates/project-model/src/sysroot.rs
diff --git a/crates/project_model/src/tests.rs b/crates/project-model/src/tests.rs
index 3d089b61b5a..3d089b61b5a 100644
--- a/crates/project_model/src/tests.rs
+++ b/crates/project-model/src/tests.rs
diff --git a/crates/project_model/src/workspace.rs b/crates/project-model/src/workspace.rs
index 93255705be4..93255705be4 100644
--- a/crates/project_model/src/workspace.rs
+++ b/crates/project-model/src/workspace.rs
diff --git a/crates/project_model/test_data/fake-sysroot/alloc/src/lib.rs b/crates/project-model/test_data/fake-sysroot/alloc/src/lib.rs
index e69de29bb2d..e69de29bb2d 100644
--- a/crates/project_model/test_data/fake-sysroot/alloc/src/lib.rs
+++ b/crates/project-model/test_data/fake-sysroot/alloc/src/lib.rs
diff --git a/crates/project_model/test_data/fake-sysroot/core/src/lib.rs b/crates/project-model/test_data/fake-sysroot/core/src/lib.rs
index e69de29bb2d..e69de29bb2d 100644
--- a/crates/project_model/test_data/fake-sysroot/core/src/lib.rs
+++ b/crates/project-model/test_data/fake-sysroot/core/src/lib.rs
diff --git a/crates/project_model/test_data/fake-sysroot/panic_abort/src/lib.rs b/crates/project-model/test_data/fake-sysroot/panic_abort/src/lib.rs
index e69de29bb2d..e69de29bb2d 100644
--- a/crates/project_model/test_data/fake-sysroot/panic_abort/src/lib.rs
+++ b/crates/project-model/test_data/fake-sysroot/panic_abort/src/lib.rs
diff --git a/crates/project_model/test_data/fake-sysroot/panic_unwind/src/lib.rs b/crates/project-model/test_data/fake-sysroot/panic_unwind/src/lib.rs
index e69de29bb2d..e69de29bb2d 100644
--- a/crates/project_model/test_data/fake-sysroot/panic_unwind/src/lib.rs
+++ b/crates/project-model/test_data/fake-sysroot/panic_unwind/src/lib.rs
diff --git a/crates/project_model/test_data/fake-sysroot/proc_macro/src/lib.rs b/crates/project-model/test_data/fake-sysroot/proc_macro/src/lib.rs
index e69de29bb2d..e69de29bb2d 100644
--- a/crates/project_model/test_data/fake-sysroot/proc_macro/src/lib.rs
+++ b/crates/project-model/test_data/fake-sysroot/proc_macro/src/lib.rs
diff --git a/crates/project_model/test_data/fake-sysroot/profiler_builtins/src/lib.rs b/crates/project-model/test_data/fake-sysroot/profiler_builtins/src/lib.rs
index e69de29bb2d..e69de29bb2d 100644
--- a/crates/project_model/test_data/fake-sysroot/profiler_builtins/src/lib.rs
+++ b/crates/project-model/test_data/fake-sysroot/profiler_builtins/src/lib.rs
diff --git a/crates/project_model/test_data/fake-sysroot/std/src/lib.rs b/crates/project-model/test_data/fake-sysroot/std/src/lib.rs
index e69de29bb2d..e69de29bb2d 100644
--- a/crates/project_model/test_data/fake-sysroot/std/src/lib.rs
+++ b/crates/project-model/test_data/fake-sysroot/std/src/lib.rs
diff --git a/crates/project_model/test_data/fake-sysroot/stdarch/crates/std_detect/src/lib.rs b/crates/project-model/test_data/fake-sysroot/stdarch/crates/std_detect/src/lib.rs
index e69de29bb2d..e69de29bb2d 100644
--- a/crates/project_model/test_data/fake-sysroot/stdarch/crates/std_detect/src/lib.rs
+++ b/crates/project-model/test_data/fake-sysroot/stdarch/crates/std_detect/src/lib.rs
diff --git a/crates/project_model/test_data/fake-sysroot/term/src/lib.rs b/crates/project-model/test_data/fake-sysroot/term/src/lib.rs
index e69de29bb2d..e69de29bb2d 100644
--- a/crates/project_model/test_data/fake-sysroot/term/src/lib.rs
+++ b/crates/project-model/test_data/fake-sysroot/term/src/lib.rs
diff --git a/crates/project_model/test_data/fake-sysroot/test/src/lib.rs b/crates/project-model/test_data/fake-sysroot/test/src/lib.rs
index e69de29bb2d..e69de29bb2d 100644
--- a/crates/project_model/test_data/fake-sysroot/test/src/lib.rs
+++ b/crates/project-model/test_data/fake-sysroot/test/src/lib.rs
diff --git a/crates/project_model/test_data/fake-sysroot/unwind/src/lib.rs b/crates/project-model/test_data/fake-sysroot/unwind/src/lib.rs
index e69de29bb2d..e69de29bb2d 100644
--- a/crates/project_model/test_data/fake-sysroot/unwind/src/lib.rs
+++ b/crates/project-model/test_data/fake-sysroot/unwind/src/lib.rs
diff --git a/crates/project_model/test_data/hello-world-metadata.json b/crates/project-model/test_data/hello-world-metadata.json
index b6142eeaf2f..b6142eeaf2f 100644
--- a/crates/project_model/test_data/hello-world-metadata.json
+++ b/crates/project-model/test_data/hello-world-metadata.json
diff --git a/crates/project_model/test_data/hello-world-project.json b/crates/project-model/test_data/hello-world-project.json
index b27ab1f42b5..b27ab1f42b5 100644
--- a/crates/project_model/test_data/hello-world-project.json
+++ b/crates/project-model/test_data/hello-world-project.json
diff --git a/crates/project_model/test_data/is-proc-macro-project.json b/crates/project-model/test_data/is-proc-macro-project.json
index 5d500a4729f..5d500a4729f 100644
--- a/crates/project_model/test_data/is-proc-macro-project.json
+++ b/crates/project-model/test_data/is-proc-macro-project.json
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 2fafd44b1f0..767f59e61cb 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -48,23 +48,23 @@ always-assert = "0.1.2"
 stdx = { path = "../stdx", version = "0.0.0" }
 flycheck = { path = "../flycheck", version = "0.0.0" }
 ide = { path = "../ide", version = "0.0.0" }
-ide_db = { path = "../ide_db", version = "0.0.0" }
+ide-db = { path = "../ide-db", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
-project_model = { path = "../project_model", version = "0.0.0" }
+project-model = { path = "../project-model", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
 vfs = { path = "../vfs", version = "0.0.0" }
 vfs-notify = { path = "../vfs-notify", version = "0.0.0" }
 cfg = { path = "../cfg", version = "0.0.0" }
 toolchain = { path = "../toolchain", version = "0.0.0" }
 tt = { path = "../tt", version = "0.0.0" }
-proc_macro_api = { path = "../proc_macro_api", version = "0.0.0" }
+proc-macro-api = { path = "../proc-macro-api", version = "0.0.0" }
 
 # This should only be used in CLI
-ide_ssr = { path = "../ide_ssr", version = "0.0.0" }
+ide-ssr = { path = "../ide-ssr", version = "0.0.0" }
 hir = { path = "../hir", version = "0.0.0" }
-hir_def = { path = "../hir_def", version = "0.0.0" }
-hir_ty = { path = "../hir_ty", version = "0.0.0" }
-proc_macro_srv = { path = "../proc_macro_srv", version = "0.0.0" }
+hir-def = { path = "../hir-def", version = "0.0.0" }
+hir-ty = { path = "../hir-ty", version = "0.0.0" }
+proc-macro-srv = { path = "../proc-macro-srv", version = "0.0.0" }
 
 [target.'cfg(windows)'.dependencies]
 winapi = "0.3.9"
@@ -77,7 +77,7 @@ expect-test = "1.2.2"
 jod-thread = "0.1.2"
 xshell = "0.2.1"
 
-test_utils = { path = "../test_utils" }
+test-utils = { path = "../test-utils" }
 sourcegen = { path = "../sourcegen" }
 mbe = { path = "../mbe" }
 
diff --git a/crates/rust-analyzer/tests/slow-tests/tidy.rs b/crates/rust-analyzer/tests/slow-tests/tidy.rs
index 4a2f45fd51f..9109617ecff 100644
--- a/crates/rust-analyzer/tests/slow-tests/tidy.rs
+++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs
@@ -195,11 +195,11 @@ https://github.blog/2015-06-08-how-to-undo-almost-anything-with-git/#redo-after-
 fn deny_clippy(path: &Path, text: &str) {
     let ignore = &[
         // The documentation in string literals may contain anything for its own purposes
-        "ide_db/src/generated/lints.rs",
+        "ide-db/src/generated/lints.rs",
         // The tests test clippy lint hovers
         "ide/src/hover/tests.rs",
         // The tests test clippy lint completions
-        "ide_completion/src/tests/attribute.rs",
+        "ide-completion/src/tests/attribute.rs",
     ];
     if ignore.iter().any(|p| path.ends_with(p)) {
         return;
@@ -289,11 +289,11 @@ fn check_todo(path: &Path, text: &str) {
         // `ast::make`.
         "ast/make.rs",
         // The documentation in string literals may contain anything for its own purposes
-        "ide_db/src/generated/lints.rs",
-        "ide_assists/src/utils/gen_trait_fn_body.rs",
-        "ide_assists/src/tests/generated.rs",
+        "ide-db/src/generated/lints.rs",
+        "ide-assists/src/utils/gen_trait_fn_body.rs",
+        "ide-assists/src/tests/generated.rs",
         // The tests for missing fields
-        "ide_diagnostics/src/handlers/missing_fields.rs",
+        "ide-diagnostics/src/handlers/missing_fields.rs",
     ];
     if need_todo.iter().any(|p| path.ends_with(p)) {
         return;
@@ -320,12 +320,12 @@ fn check_dbg(path: &Path, text: &str) {
         // Assists to remove `dbg!()`
         "handlers/remove_dbg.rs",
         // We have .dbg postfix
-        "ide_completion/src/completions/postfix.rs",
-        "ide_completion/src/completions/keyword.rs",
-        "ide_completion/src/tests/proc_macros.rs",
+        "ide-completion/src/completions/postfix.rs",
+        "ide-completion/src/completions/keyword.rs",
+        "ide-completion/src/tests/proc_macros.rs",
         // The documentation in string literals may contain anything for its own purposes
-        "ide_completion/src/lib.rs",
-        "ide_db/src/generated/lints.rs",
+        "ide-completion/src/lib.rs",
+        "ide-db/src/generated/lints.rs",
         // test for doc test for remove_dbg
         "src/tests/generated.rs",
     ];
@@ -351,13 +351,13 @@ fn check_test_attrs(path: &Path, text: &str) {
         "ide/src/runnables.rs",
         // A legit test which needs to be ignored, as it takes too long to run
         // :(
-        "hir_def/src/nameres/collector.rs",
+        "hir-def/src/nameres/collector.rs",
         // Long sourcegen test to generate lint completions.
-        "ide_db/src/tests/sourcegen_lints.rs",
+        "ide-db/src/tests/sourcegen_lints.rs",
         // Obviously needs ignore.
-        "ide_assists/src/handlers/toggle_ignore.rs",
+        "ide-assists/src/handlers/toggle_ignore.rs",
         // See above.
-        "ide_assists/src/tests/generated.rs",
+        "ide-assists/src/tests/generated.rs",
     ];
     if text.contains("#[ignore") && !need_ignore.iter().any(|p| path.ends_with(p)) {
         panic!("\ndon't `#[ignore]` tests, see:\n\n    {}\n\n   {}\n", ignore_rule, path.display(),)
@@ -368,7 +368,7 @@ fn check_test_attrs(path: &Path, text: &str) {
     let need_panic: &[&str] = &[
         // This file.
         "slow-tests/tidy.rs",
-        "test_utils/src/fixture.rs",
+        "test-utils/src/fixture.rs",
     ];
     if text.contains("#[should_panic") && !need_panic.iter().any(|p| path.ends_with(p)) {
         panic!(
diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml
index 99bc30f0763..127eaa519bf 100644
--- a/crates/syntax/Cargo.toml
+++ b/crates/syntax/Cargo.toml
@@ -21,7 +21,7 @@ indexmap = "1.8.0"
 smol_str = "0.1.21"
 
 stdx = { path = "../stdx", version = "0.0.0" }
-text_edit = { path = "../text_edit", version = "0.0.0" }
+text-edit = { path = "../text-edit", version = "0.0.0" }
 parser = { path = "../parser", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
 
@@ -32,5 +32,5 @@ proc-macro2 = "1.0.36"
 quote = "1.0.16"
 ungrammar = "1.16.1"
 
-test_utils = { path = "../test_utils" }
+test-utils = { path = "../test-utils" }
 sourcegen = { path = "../sourcegen" }
diff --git a/crates/test_utils/Cargo.toml b/crates/test-utils/Cargo.toml
index e8a8ef04b4b..f542af1659b 100644
--- a/crates/test_utils/Cargo.toml
+++ b/crates/test-utils/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "test_utils"
+name = "test-utils"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
diff --git a/crates/test_utils/src/assert_linear.rs b/crates/test-utils/src/assert_linear.rs
index 24502ddb41a..24502ddb41a 100644
--- a/crates/test_utils/src/assert_linear.rs
+++ b/crates/test-utils/src/assert_linear.rs
diff --git a/crates/test_utils/src/bench_fixture.rs b/crates/test-utils/src/bench_fixture.rs
index 979156263de..979156263de 100644
--- a/crates/test_utils/src/bench_fixture.rs
+++ b/crates/test-utils/src/bench_fixture.rs
diff --git a/crates/test_utils/src/fixture.rs b/crates/test-utils/src/fixture.rs
index 8c806e7925b..8c806e7925b 100644
--- a/crates/test_utils/src/fixture.rs
+++ b/crates/test-utils/src/fixture.rs
diff --git a/crates/test_utils/src/lib.rs b/crates/test-utils/src/lib.rs
index 4438a12093a..4438a12093a 100644
--- a/crates/test_utils/src/lib.rs
+++ b/crates/test-utils/src/lib.rs
diff --git a/crates/test_utils/src/minicore.rs b/crates/test-utils/src/minicore.rs
index 8474014a2cb..8474014a2cb 100644
--- a/crates/test_utils/src/minicore.rs
+++ b/crates/test-utils/src/minicore.rs
diff --git a/crates/text_edit/Cargo.toml b/crates/text-edit/Cargo.toml
index fde19f1363c..cf14bbd3c3e 100644
--- a/crates/text_edit/Cargo.toml
+++ b/crates/text-edit/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "text_edit"
+name = "text-edit"
 version = "0.0.0"
 description = "TBD"
 license = "MIT OR Apache-2.0"
diff --git a/crates/text_edit/src/lib.rs b/crates/text-edit/src/lib.rs
index 922d24bc754..922d24bc754 100644
--- a/crates/text_edit/src/lib.rs
+++ b/crates/text-edit/src/lib.rs
generated by cgit-pink 1.4.1-3-g733a5 (git 2.37.1) at 2026-04-23 08:47:49 +0000