Auto merge of rust-lang#16747 - Veykril:cleanup, r=Veykril

internal: Clean some stuff up Just a bunch of small refactorings, mainly from browsing through `hir-def`
matthiaskrgr · Mar 4, 2024 · 99a1b8f · 99a1b8f
2 parents 2074cc2 + 4303e74
commit 99a1b8f
Show file tree

Hide file tree

Showing 42 changed files with 421 additions and 456 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/base-db/Cargo.toml b/crates/base-db/Cargo.toml
@@ -21,7 +21,6 @@ tracing.workspace = true
 
 # local deps
 cfg.workspace = true
-profile.workspace = true
 stdx.workspace = true
 syntax.workspace = true
 vfs.workspace = true

diff --git a/crates/hir-def/src/body.rs b/crates/hir-def/src/body.rs
@@ -13,7 +13,6 @@ use cfg::{CfgExpr, CfgOptions};
 use either::Either;
 use hir_expand::{name::Name, HirFileId, InFile};
 use la_arena::{Arena, ArenaMap};
-use profile::Count;
 use rustc_hash::FxHashMap;
 use syntax::{ast, AstPtr, SyntaxNodePtr};
 use triomphe::Arc;
@@ -51,7 +50,6 @@ pub struct Body {
  pub body_expr: ExprId,
  /// Block expressions in this body that may contain inner items.
  block_scopes: Vec<BlockId>,
- _c: Count<Self>,
 }
 
 pub type ExprPtr = AstPtr<ast::Expr>;
@@ -216,7 +214,6 @@ impl Body {
 
  fn shrink_to_fit(&mut self) {
  let Self {
- _c: _,
  body_expr: _,
  block_scopes,
  exprs,
@@ -300,7 +297,6 @@ impl Default for Body {
  params: Default::default(),
  block_scopes: Default::default(),
  binding_owners: Default::default(),
- _c: Default::default(),
  }
  }
 }

diff --git a/crates/hir-def/src/body/lower.rs b/crates/hir-def/src/body/lower.rs
@@ -10,7 +10,6 @@ use hir_expand::{
  ExpandError, InFile,
 };
 use intern::Interned;
-use profile::Count;
 use rustc_hash::FxHashMap;
 use smallvec::SmallVec;
 use span::AstIdMap;
@@ -76,7 +75,6 @@ pub(super) fn lower(
  params: Vec::new(),
  body_expr: dummy_expr_id(),
  block_scopes: Vec::new(),
- _c: Count::new(),
  },
  expander,
  current_try_block_label: None,

diff --git a/crates/hir-def/src/item_tree.rs b/crates/hir-def/src/item_tree.rs
@@ -50,7 +50,6 @@ use either::Either;
 use hir_expand::{attrs::RawAttrs, name::Name, ExpandTo, HirFileId, InFile};
 use intern::Interned;
 use la_arena::{Arena, Idx, IdxRange, RawIdx};
-use profile::Count;
 use rustc_hash::FxHashMap;
 use smallvec::SmallVec;
 use span::{AstIdNode, FileAstId, Span};
@@ -94,8 +93,6 @@ impl fmt::Debug for RawVisibilityId {
 /// The item tree of a source file.
 #[derive(Debug, Default, Eq, PartialEq)]
 pub struct ItemTree {
- _c: Count<Self>,
-
  top_level: SmallVec<[ModItem; 1]>,
  attrs: FxHashMap<AttrOwner, RawAttrs>,
 
@@ -263,14 +260,6 @@ impl ItemVisibilities {
  }
 }
 
-static VIS_PUB: RawVisibility = RawVisibility::Public;
-static VIS_PRIV_IMPLICIT: RawVisibility =
- RawVisibility::Module(ModPath::from_kind(PathKind::Super(0)), VisibilityExplicitness::Implicit);
-static VIS_PRIV_EXPLICIT: RawVisibility =
- RawVisibility::Module(ModPath::from_kind(PathKind::Super(0)), VisibilityExplicitness::Explicit);
-static VIS_PUB_CRATE: RawVisibility =
- RawVisibility::Module(ModPath::from_kind(PathKind::Crate), VisibilityExplicitness::Explicit);
-
 #[derive(Default, Debug, Eq, PartialEq)]
 struct ItemTreeData {
  uses: Arena<Use>,
@@ -562,6 +551,20 @@ impl_index!(fields: Field, variants: Variant, params: Param);
 impl Index<RawVisibilityId> for ItemTree {
  type Output = RawVisibility;
  fn index(&self, index: RawVisibilityId) -> &Self::Output {
+ static VIS_PUB: RawVisibility = RawVisibility::Public;
+ static VIS_PRIV_IMPLICIT: RawVisibility = RawVisibility::Module(
+ ModPath::from_kind(PathKind::Super(0)),
+ VisibilityExplicitness::Implicit,
+ );
+ static VIS_PRIV_EXPLICIT: RawVisibility = RawVisibility::Module(
+ ModPath::from_kind(PathKind::Super(0)),
+ VisibilityExplicitness::Explicit,
+ );
+ static VIS_PUB_CRATE: RawVisibility = RawVisibility::Module(
+ ModPath::from_kind(PathKind::Crate),
+ VisibilityExplicitness::Explicit,
+ );
+
  match index {
  RawVisibilityId::PRIV_IMPLICIT => &VIS_PRIV_IMPLICIT,
  RawVisibilityId::PRIV_EXPLICIT => &VIS_PRIV_EXPLICIT,
@@ -871,25 +874,19 @@ impl UseTree {
  prefix: Option<ModPath>,
  path: &ModPath,
  ) -> Option<(ModPath, ImportKind)> {
- match (prefix, &path.kind) {
+ match (prefix, path.kind) {
  (None, _) => Some((path.clone(), ImportKind::Plain)),
  (Some(mut prefix), PathKind::Plain) => {
- for segment in path.segments() {
- prefix.push_segment(segment.clone());
- }
+ prefix.extend(path.segments().iter().cloned());
  Some((prefix, ImportKind::Plain))
  }
- (Some(mut prefix), PathKind::Super(n))
- if *n > 0 && prefix.segments().is_empty() =>
- {
+ (Some(mut prefix), PathKind::Super(n)) if n > 0 && prefix.segments().is_empty() => {
  // `super::super` + `super::rest`
  match &mut prefix.kind {
  PathKind::Super(m) => {
  cov_mark::hit!(concat_super_mod_paths);
- *m += *n;
- for segment in path.segments() {
- prefix.push_segment(segment.clone());
- }
+ *m += n;
+ prefix.extend(path.segments().iter().cloned());
  Some((prefix, ImportKind::Plain))
  }
  _ => None,
@@ -963,10 +960,10 @@ impl ModItem {
  | ModItem::Mod(_)
  | ModItem::MacroRules(_)
  | ModItem::Macro2(_) => None,
- ModItem::MacroCall(call) => Some(AssocItem::MacroCall(*call)),
- ModItem::Const(konst) => Some(AssocItem::Const(*konst)),
- ModItem::TypeAlias(alias) => Some(AssocItem::TypeAlias(*alias)),
- ModItem::Function(func) => Some(AssocItem::Function(*func)),
+ &ModItem::MacroCall(call) => Some(AssocItem::MacroCall(call)),
+ &ModItem::Const(konst) => Some(AssocItem::Const(konst)),
+ &ModItem::TypeAlias(alias) => Some(AssocItem::TypeAlias(alias)),
+ &ModItem::Function(func) => Some(AssocItem::Function(func)),
  }
  }