From 90b994b8832e913f08930dfc5f40b001856595ca Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Tue, 17 Feb 2026 11:37:01 +1100 Subject: [PATCH] Rename query `dep_kind`. The next commit will bring back `enum DepKind` and there would be a variant `DepKind::dep_kind`. This makes it impossible to have a variable named `dep_kind`, because the `bindings_with_variant_name` lint is overzealous. For this code: ``` let dep_kind = DepKind::dep_kind; ``` the lint will give this error: ``` pattern binding `dep_kind` is named the same as one of the variants of the type `DepKind` ``` This is arguably a bug in the lint. To work around it, this commit renames the `dep_kind` query as `crate_dep_kind`. It is a better name anyway given that `DepKind` and `CrateDepKind` are different things. --- compiler/rustc_codegen_ssa/src/base.rs | 2 +- compiler/rustc_metadata/src/dependency_format.rs | 10 +++++----- .../rustc_metadata/src/rmeta/decoder/cstore_impl.rs | 2 +- compiler/rustc_metadata/src/rmeta/encoder.rs | 2 +- compiler/rustc_middle/src/queries.rs | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/compiler/rustc_codegen_ssa/src/base.rs b/compiler/rustc_codegen_ssa/src/base.rs index 85c8890d661c..61e08c0f9323 100644 --- a/compiler/rustc_codegen_ssa/src/base.rs +++ b/compiler/rustc_codegen_ssa/src/base.rs @@ -911,7 +911,7 @@ pub fn new(tcx: TyCtxt<'_>, target_cpu: String) -> CrateInfo { .rev() .copied() .filter(|&cnum| { - let link = !tcx.dep_kind(cnum).macros_only(); + let link = !tcx.crate_dep_kind(cnum).macros_only(); if link && tcx.is_compiler_builtins(cnum) { compiler_builtins = Some(cnum); return false; diff --git a/compiler/rustc_metadata/src/dependency_format.rs b/compiler/rustc_metadata/src/dependency_format.rs index a74d387ad5a4..30721784ad65 100644 --- a/compiler/rustc_metadata/src/dependency_format.rs +++ b/compiler/rustc_metadata/src/dependency_format.rs @@ -146,7 +146,7 @@ fn calculate_type(tcx: TyCtxt<'_>, ty: CrateType) -> DependencyList { && !sess.target.crt_static_allows_dylibs) { for &cnum in tcx.crates(()).iter() { - if tcx.dep_kind(cnum).macros_only() { + if tcx.crate_dep_kind(cnum).macros_only() { continue; } let src = tcx.used_crate_source(cnum); @@ -163,7 +163,7 @@ fn calculate_type(tcx: TyCtxt<'_>, ty: CrateType) -> DependencyList { let all_dylibs = || { tcx.crates(()).iter().filter(|&&cnum| { - !tcx.dep_kind(cnum).macros_only() + !tcx.crate_dep_kind(cnum).macros_only() && (tcx.used_crate_source(cnum).dylib.is_some() || tcx.used_crate_source(cnum).sdylib_interface.is_some()) }) @@ -241,7 +241,7 @@ fn calculate_type(tcx: TyCtxt<'_>, ty: CrateType) -> DependencyList { let src = tcx.used_crate_source(cnum); if src.dylib.is_none() && !formats.contains_key(&cnum) - && tcx.dep_kind(cnum) == CrateDepKind::Unconditional + && tcx.crate_dep_kind(cnum) == CrateDepKind::Unconditional { assert!(src.rlib.is_some() || src.rmeta.is_some()); info!("adding staticlib: {}", tcx.crate_name(cnum)); @@ -333,7 +333,7 @@ fn attempt_static(tcx: TyCtxt<'_>, unavailable: &mut Vec) -> Option, unavailable: &mut Vec) -> Option Linkage::Static, CrateDepKind::MacrosOnly | CrateDepKind::Conditional => Linkage::NotLinked, }), diff --git a/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs index 6ea9a2852804..3c14fd859b98 100644 --- a/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs +++ b/compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs @@ -382,7 +382,7 @@ fn into_args(self) -> (DefId, SimplifiedType) { implementations_of_trait => { cdata.get_implementations_of_trait(tcx, other) } crate_incoherent_impls => { cdata.get_incoherent_impls(tcx, other) } - dep_kind => { cdata.dep_kind } + crate_dep_kind => { cdata.dep_kind } module_children => { tcx.arena.alloc_from_iter(cdata.get_module_children(tcx, def_id.index)) } diff --git a/compiler/rustc_metadata/src/rmeta/encoder.rs b/compiler/rustc_metadata/src/rmeta/encoder.rs index a3d8b07fb1d9..758a7f6fcc04 100644 --- a/compiler/rustc_metadata/src/rmeta/encoder.rs +++ b/compiler/rustc_metadata/src/rmeta/encoder.rs @@ -2072,7 +2072,7 @@ fn encode_crate_deps(&mut self) -> LazyArray { name: self.tcx.crate_name(cnum), hash: self.tcx.crate_hash(cnum), host_hash: self.tcx.crate_host_hash(cnum), - kind: self.tcx.dep_kind(cnum), + kind: self.tcx.crate_dep_kind(cnum), extra_filename: self.tcx.extra_filename(cnum).clone(), is_private: self.tcx.is_private_dep(cnum), }; diff --git a/compiler/rustc_middle/src/queries.rs b/compiler/rustc_middle/src/queries.rs index 59171f2da4f2..cb922a2ad90b 100644 --- a/compiler/rustc_middle/src/queries.rs +++ b/compiler/rustc_middle/src/queries.rs @@ -2179,7 +2179,7 @@ desc { "computing the uninhabited predicate of `{}`", key } } - query dep_kind(_: CrateNum) -> CrateDepKind { + query crate_dep_kind(_: CrateNum) -> CrateDepKind { eval_always desc { "fetching what a dependency looks like" } separate_provide_extern