Rollup merge of #96142 - cjgillot:no-crate-def-index, r=petrochenkov

Stop using CRATE_DEF_INDEX outside of metadata encoding.

`CRATE_DEF_ID` and `CrateNum::as_def_id` are almost always what we want.  We should not manipulate raw `DefIndex` outside of metadata encoding.

diff --cc compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
Simple merge

diff --cc compiler/rustc_metadata/src/rmeta/encoder.rs
Simple merge

diff --cc compiler/rustc_middle/src/ty/mod.rs
Simple merge

diff --cc compiler/rustc_middle/src/ty/print/pretty.rs
index cac46ba25fe6bc3db7397e12a3e5bd7f5c07d4b0,d2c5bd1898614a7270b5617efccff6ce6311e118..38362a4cbb92529a8a164ba137096bd1cda4e70a
--- 1/compiler/rustc_middle/src/ty/print/pretty.rs
--- 2/compiler/rustc_middle/src/ty/print/pretty.rs
+++ b/compiler/rustc_middle/src/ty/print/pretty.rs
@@@ -6,8 -6,9 +6,8 @@@ use rustc_data_structures::fx::FxHashMa
  use rustc_data_structures::sso::SsoHashSet;
  use rustc_hir as hir;
  use rustc_hir::def::{self, CtorKind, DefKind, Namespace};
- use rustc_hir::def_id::{DefId, DefIdSet, CRATE_DEF_INDEX, LOCAL_CRATE};
+ use rustc_hir::def_id::{DefId, DefIdSet, CRATE_DEF_ID, LOCAL_CRATE};
  use rustc_hir::definitions::{DefPathData, DefPathDataName, DisambiguatedDefPathData};
 -use rustc_hir::ItemKind;
  use rustc_session::config::TrimmedDefPaths;
  use rustc_session::cstore::{ExternCrate, ExternCrateSource};
  use rustc_span::symbol::{kw, Ident, Symbol};

diff --cc compiler/rustc_resolve/src/build_reduced_graph.rs
Simple merge

diff --cc compiler/rustc_resolve/src/late.rs
index 9bc5d63ca179e0b580d1645dd5db690dcd7940e8,1a98dd38fc97eb5a7dd62510af61ed2626b1b46f..591bad70840a4ec7009eb274f7c3a5b17fda1c8b
--- 1/compiler/rustc_resolve/src/late.rs
--- 2/compiler/rustc_resolve/src/late.rs
+++ b/compiler/rustc_resolve/src/late.rs
@@@ -19,9 -19,8 +19,9 @@@ use rustc_data_structures::fx::{FxHashM
  use rustc_errors::DiagnosticId;
  use rustc_hir::def::Namespace::{self, *};
  use rustc_hir::def::{self, CtorKind, DefKind, PartialRes, PerNS};
- use rustc_hir::def_id::{DefId, CRATE_DEF_INDEX};
+ use rustc_hir::def_id::{DefId, CRATE_DEF_ID};
  use rustc_hir::{PrimTy, TraitCandidate};
 +use rustc_middle::ty::DefIdTree;
  use rustc_middle::{bug, span_bug};
  use rustc_session::lint;
  use rustc_span::symbol::{kw, sym, Ident, Symbol};

diff --cc compiler/rustc_resolve/src/late/diagnostics.rs
Simple merge

diff --cc compiler/rustc_resolve/src/lib.rs
Simple merge

diff --cc src/librustdoc/formats/cache.rs
Simple merge