rustc_public: Make CrateNum a newtype.

Author: aDotInTheVoid

compiler/rustc_public/src/compiler_interface.rs

@@ -25,7 +25,7 @@ use crate::ty::{
 use crate::unstable::{RustcInternal, Stable, new_item_kind};
 use crate::{
     AssocItems, Crate, CrateDef, CrateItem, CrateItems, CrateNum, DefId, Error, Filename,
-    ImplTraitDecls, ItemKind, ReferencesTls, Symbol, TraitDecls, alloc, mir,
+    ImplTraitDecls, ItemKind, Symbol, TraitDecls, alloc, mir,
 };
 
 pub struct BridgeTys;
@@ -1093,7 +1093,7 @@ fn smir_crate<'tcx>(
 ) -> Crate {
     let name = cx.crate_name(crate_num);
     let is_local = cx.crate_is_local(crate_num);
-    let id = cx.crate_num_id(crate_num);
+    let id = CrateNum(cx.crate_num_id(crate_num));
     debug!(?name, ?crate_num, "smir_crate");
-    Crate { id, name, is_local, references_tls: ReferencesTLS }
+    Crate { id, name, is_local }
 }

compiler/rustc_public/src/lib.rs

@@ -23,9 +23,9 @@ use std::fmt::Debug;
 use std::marker::PhantomData;
 use std::{fmt, io};
 
-use rustc_public_bridge::context::CompilerCtxt;
 pub(crate) use rustc_public_bridge::IndexedVal;
 use rustc_public_bridge::Tables;
+use rustc_public_bridge::context::CompilerCtxt;
 /// Export the rustc_internal APIs. Note that this module has no stability
 /// guarantees and it is not taken into account for semver.
 #[cfg(feature = "rustc_internal")]
@@ -57,8 +57,8 @@ pub mod visitor;
 pub type Symbol = String;
 
 /// The number that identifies a crate.
-// FIXME: Make this a newtype, so it can have a `ReferencesTls`
-pub type CrateNum = usize;
+#[derive(Clone, Copy, Serialize, PartialEq, Eq, Debug)]
+pub struct CrateNum(pub(crate) usize, ThreadLocalIndex);
 
 impl Debug for DefId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -84,9 +84,6 @@ pub struct Crate {
     pub id: CrateNum,
     pub name: Symbol,
     pub is_local: bool,
-    // FIXME: Remove this when `CrateNum` holds `ReferencesTLS`
-    #[serde(skip)]
-    references_tls: ReferencesTls,
 }
 
 impl Crate {

compiler/rustc_public/src/rustc_internal/mod.rs

@@ -53,7 +53,7 @@ where
 }
 
 pub fn crate_num(item: &crate::Crate) -> CrateNum {
-    item.id.into()
+    CrateNum::from_u32(item.id.0)
 }
 
 // A thread local variable that stores a pointer to the tables mapping between TyCtxt

compiler/rustc_public/src/unstable/convert/internal.rs

@@ -40,7 +40,7 @@ impl RustcInternal for CrateNum {
         _tables: &mut Tables<'_, BridgeTys>,
         _tcx: impl InternalCx<'tcx>,
     ) -> Self::T<'tcx> {
-        rustc_span::def_id::CrateNum::from_usize(*self)
+        rustc_span::def_id::CrateNum::from_usize(self.0)
     }
 }