rust-analyzer

diff --git a/crates/hir-def/src/body/lower.rs b/crates/hir-def/src/body/lower.rs
index 91eeff5b0e..08c1093819 100644
--- a/crates/hir-def/src/body/lower.rs
+++ b/crates/hir-def/src/body/lower.rs

@@ -26,10 +26,12 @@ use syntax::{

};

use crate::{

- adt::StructKind,

- body::{Body, BodySourceMap, Expander, ExprPtr, LabelPtr, LabelSource, PatPtr},

- body::{BodyDiagnostic, ExprSource, PatSource},

+ body::{

+ Body, BodyDiagnostic, BodySourceMap, Expander, ExprPtr, ExprSource, LabelPtr, LabelSource,

+ PatPtr, PatSource,

+ },

builtin_type::{BuiltinFloat, BuiltinInt, BuiltinUint},

+ data::adt::StructKind,

db::DefDatabase,

expr::{

dummy_expr_id, Array, Binding, BindingAnnotation, BindingId, ClosureKind, Expr, ExprId,

diff --git a/crates/hir-def/src/data.rs b/crates/hir-def/src/data.rs
index 431140a665..9d368911a4 100644
--- a/crates/hir-def/src/data.rs
+++ b/crates/hir-def/src/data.rs

@@ -1,5 +1,7 @@

//! Contains basic data about various HIR declarations.

+pub mod adt;

use std::sync::Arc;

use hir_expand::{name::Name, AstId, ExpandResult, HirFileId, InFile, MacroCallId, MacroDefKind};

diff --git a/crates/hir-def/src/adt.rs b/crates/hir-def/src/data/adt.rs
index 7a5025aa6a..7a5025aa6a 100644
--- a/crates/hir-def/src/adt.rs
+++ b/crates/hir-def/src/data/adt.rs

diff --git a/crates/hir-def/src/db.rs b/crates/hir-def/src/db.rs
index 8d236aca36..2dfe4b6264 100644
--- a/crates/hir-def/src/db.rs
+++ b/crates/hir-def/src/db.rs

@@ -9,10 +9,10 @@ use la_arena::ArenaMap;

use syntax::{ast, AstPtr};

use crate::{

- adt::{EnumData, StructData},

attr::{Attrs, AttrsWithOwner},

body::{scope::ExprScopes, Body, BodySourceMap},

data::{

+ adt::{EnumData, StructData},

ConstData, FunctionData, ImplData, Macro2Data, MacroRulesData, ProcMacroData, StaticData,

TraitAliasData, TraitData, TypeAliasData,

diff --git a/crates/hir-def/src/lib.rs b/crates/hir-def/src/lib.rs
index 8c2e93f090..b7db1f0336 100644
--- a/crates/hir-def/src/lib.rs
+++ b/crates/hir-def/src/lib.rs

@@ -29,7 +29,6 @@ pub mod keys;

pub mod item_tree;

-pub mod adt;

pub mod data;

pub mod generics;

pub mod lang_item;

@@ -82,8 +81,8 @@ use syntax::ast;

use ::tt::token_id as tt;

use crate::{

- adt::VariantData,

builtin_type::BuiltinType,

+ data::adt::VariantData,

item_tree::{

Const, Enum, Function, Impl, ItemTreeId, ItemTreeNode, MacroDef, MacroRules, ModItem,

Static, Struct, Trait, TraitAlias, TypeAlias, Union,

@@ -236,7 +235,7 @@ pub struct EnumVariantId {

pub local_id: LocalEnumVariantId,

}

-pub type LocalEnumVariantId = Idx<adt::EnumVariantData>;

+pub type LocalEnumVariantId = Idx<data::adt::EnumVariantData>;

#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]

pub struct FieldId {

@@ -244,7 +243,7 @@ pub struct FieldId {

pub local_id: LocalFieldId,

}

-pub type LocalFieldId = Idx<adt::FieldData>;

+pub type LocalFieldId = Idx<data::adt::FieldData>;

#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]

pub struct ConstId(salsa::InternId);

diff --git a/crates/hir-def/src/nameres/path_resolution.rs b/crates/hir-def/src/nameres/path_resolution.rs
index 25478481dd..8299d9684b 100644
--- a/crates/hir-def/src/nameres/path_resolution.rs
+++ b/crates/hir-def/src/nameres/path_resolution.rs

@@ -331,11 +331,11 @@ impl DefMap {

Some(local_id) => {

let variant = EnumVariantId { parent: e, local_id };

match &*enum_data.variants[local_id].variant_data {

- crate::adt::VariantData::Record(_) => {

+ crate::data::adt::VariantData::Record(_) => {

PerNs::types(variant.into(), Visibility::Public)

}

- crate::adt::VariantData::Tuple(_)

- | crate::adt::VariantData::Unit => {

+ crate::data::adt::VariantData::Tuple(_)

+ | crate::data::adt::VariantData::Unit => {

PerNs::both(variant.into(), variant.into(), Visibility::Public)

}

diff --git a/crates/hir-ty/src/diagnostics/decl_check.rs b/crates/hir-ty/src/diagnostics/decl_check.rs
index d36b93e3bd..8f493a15b4 100644
--- a/crates/hir-ty/src/diagnostics/decl_check.rs
+++ b/crates/hir-ty/src/diagnostics/decl_check.rs

@@ -16,7 +16,7 @@ use std::fmt;

use base_db::CrateId;

use hir_def::{

- adt::VariantData,

+ data::adt::VariantData,

expr::{Pat, PatId},

src::HasSource,

AdtId, AttrDefId, ConstId, EnumId, FunctionId, ItemContainerId, Lookup, ModuleDefId, StaticId,

diff --git a/crates/hir-ty/src/diagnostics/match_check.rs b/crates/hir-ty/src/diagnostics/match_check.rs
index fe1cda71dd..6db9999362 100644
--- a/crates/hir-ty/src/diagnostics/match_check.rs
+++ b/crates/hir-ty/src/diagnostics/match_check.rs

@@ -12,7 +12,7 @@ pub(crate) mod usefulness;

use chalk_ir::Mutability;

use hir_def::{

- adt::VariantData, body::Body, expr::PatId, AdtId, EnumVariantId, LocalFieldId, VariantId,

+ body::Body, data::adt::VariantData, expr::PatId, AdtId, EnumVariantId, LocalFieldId, VariantId,

};

use hir_expand::name::Name;

use stdx::{always, never};

diff --git a/crates/hir-ty/src/display.rs b/crates/hir-ty/src/display.rs
index bd3eccfe43..f1a649157c 100644
--- a/crates/hir-ty/src/display.rs
+++ b/crates/hir-ty/src/display.rs

@@ -7,8 +7,8 @@ use std::fmt::{self, Debug};

use base_db::CrateId;

use chalk_ir::{BoundVar, TyKind};

use hir_def::{

- adt::VariantData,

body,

+ data::adt::VariantData,

db::DefDatabase,

find_path,

generics::{TypeOrConstParamData, TypeParamProvenance},

diff --git a/crates/hir-ty/src/inhabitedness.rs b/crates/hir-ty/src/inhabitedness.rs
index 39324d2730..25b226bb3b 100644
--- a/crates/hir-ty/src/inhabitedness.rs
+++ b/crates/hir-ty/src/inhabitedness.rs

@@ -6,8 +6,8 @@ use chalk_ir::{

DebruijnIndex,

};

use hir_def::{

- adt::VariantData, attr::Attrs, visibility::Visibility, AdtId, EnumVariantId, HasModule, Lookup,

- ModuleId, VariantId,

+ attr::Attrs, data::adt::VariantData, visibility::Visibility, AdtId, EnumVariantId, HasModule,

+ Lookup, ModuleId, VariantId,

};

use rustc_hash::FxHashSet;

diff --git a/crates/hir-ty/src/lang_items.rs b/crates/hir-ty/src/lang_items.rs
index b0ad4fc946..adfdb01e72 100644
--- a/crates/hir-ty/src/lang_items.rs
+++ b/crates/hir-ty/src/lang_items.rs

@@ -1,6 +1,6 @@

//! Functions to detect special lang items

-use hir_def::{adt::StructFlags, lang_item::LangItem, AdtId};

+use hir_def::{data::adt::StructFlags, lang_item::LangItem, AdtId};

use hir_expand::name::Name;

use crate::db::HirDatabase;

diff --git a/crates/hir-ty/src/layout/adt.rs b/crates/hir-ty/src/layout/adt.rs
index 18199f327d..3f3017deee 100644
--- a/crates/hir-ty/src/layout/adt.rs
+++ b/crates/hir-ty/src/layout/adt.rs

@@ -3,7 +3,7 @@

use std::ops::Bound;

use hir_def::{

- adt::VariantData,

+ data::adt::VariantData,

layout::{Integer, IntegerExt, Layout, LayoutCalculator, LayoutError, RustcEnumVariantIdx},

AdtId, EnumVariantId, HasModule, LocalEnumVariantId, VariantId,

};

diff --git a/crates/hir-ty/src/lower.rs b/crates/hir-ty/src/lower.rs
index adadbb888b..c4326f98cd 100644
--- a/crates/hir-ty/src/lower.rs
+++ b/crates/hir-ty/src/lower.rs

@@ -18,9 +18,9 @@ use chalk_ir::{

use either::Either;

use hir_def::{

- adt::StructKind,

body::{Expander, LowerCtx},

builtin_type::BuiltinType,

+ data::adt::StructKind,

generics::{

TypeOrConstParamData, TypeParamProvenance, WherePredicate, WherePredicateTypeTarget,

diff --git a/crates/hir-ty/src/method_resolution.rs b/crates/hir-ty/src/method_resolution.rs
index 5d06906aa3..b04029d54b 100644
--- a/crates/hir-ty/src/method_resolution.rs
+++ b/crates/hir-ty/src/method_resolution.rs

@@ -7,9 +7,11 @@ use std::{ops::ControlFlow, sync::Arc};

use base_db::{CrateId, Edition};

use chalk_ir::{cast::Cast, Mutability, TyKind, UniverseIndex, WhereClause};

use hir_def::{

- adt::StructFlags, data::ImplData, item_scope::ItemScope, nameres::DefMap, AssocItemId, BlockId,

- ConstId, FunctionId, HasModule, ImplId, ItemContainerId, Lookup, ModuleDefId, ModuleId,

- TraitId,

+ data::{adt::StructFlags, ImplData},

+ item_scope::ItemScope,

+ nameres::DefMap,

+ AssocItemId, BlockId, ConstId, FunctionId, HasModule, ImplId, ItemContainerId, Lookup,

+ ModuleDefId, ModuleId, TraitId,

};

use hir_expand::name::Name;

use rustc_hash::{FxHashMap, FxHashSet};

diff --git a/crates/hir-ty/src/mir/lower.rs b/crates/hir-ty/src/mir/lower.rs
index 0aa5b4dc8d..2d54c0ae64 100644
--- a/crates/hir-ty/src/mir/lower.rs
+++ b/crates/hir-ty/src/mir/lower.rs

@@ -4,8 +4,8 @@ use std::{iter, mem, sync::Arc};

use chalk_ir::{BoundVar, ConstData, DebruijnIndex, TyKind};

use hir_def::{

- adt::{StructKind, VariantData},

body::Body,

+ data::adt::{StructKind, VariantData},

expr::{

Array, BindingAnnotation, BindingId, ExprId, LabelId, Literal, MatchArm, Pat, PatId,

RecordFieldPat, RecordLitField,

diff --git a/crates/hir/src/display.rs b/crates/hir/src/display.rs
index 5aae92efd1..7cb29114d7 100644
--- a/crates/hir/src/display.rs
+++ b/crates/hir/src/display.rs

@@ -1,6 +1,6 @@

//! HirDisplay implementations for various hir types.

use hir_def::{

- adt::VariantData,

+ data::adt::VariantData,

generics::{

TypeOrConstParamData, TypeParamProvenance, WherePredicate, WherePredicateTypeTarget,

diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index dbb41b1b66..59626f863a 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs

@@ -39,8 +39,8 @@ use arrayvec::ArrayVec;

use base_db::{CrateDisplayName, CrateId, CrateOrigin, Edition, FileId, ProcMacroKind};

use either::Either;

use hir_def::{

- adt::VariantData,

body::{BodyDiagnostic, SyntheticSyntax},

+ data::adt::VariantData,

expr::{BindingAnnotation, BindingId, ExprOrPatId, LabelId, Pat},

generics::{LifetimeParamData, TypeOrConstParamData, TypeParamProvenance},

item_tree::ItemTreeNode,

@@ -109,9 +109,9 @@ pub use crate::{

pub use {

cfg::{CfgAtom, CfgExpr, CfgOptions},

hir_def::{

- adt::StructKind,

attr::{Attrs, AttrsWithOwner, Documentation},

builtin_attr::AttributeTemplate,

+ data::adt::StructKind,

find_path::PrefixKind,

import_map,

nameres::ModuleSource,

diff --git a/crates/ide-assists/src/handlers/sort_items.rs b/crates/ide-assists/src/handlers/sort_items.rs
index a93704b394..63e350e155 100644
--- a/crates/ide-assists/src/handlers/sort_items.rs
+++ b/crates/ide-assists/src/handlers/sort_items.rs

@@ -116,9 +116,11 @@ trait AddRewrite {

new: Vec<T>,

target: TextRange,

) -> Option<()>;

+ fn yeet() {}

}

impl AddRewrite for Assists {

+ fn yeet() {}

fn add_rewrite<T: AstNode>(

&mut self,

label: &str,