move CrateType

Author: mejrs

Cargo.lock

@@ -3826,6 +3826,7 @@ dependencies = [
  "rustc_serialize",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "rustc_symbol_mangling",
  "rustc_target",
  "rustc_trait_selection",
@@ -3952,6 +3953,7 @@ dependencies = [
  "rustc_resolve",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "rustc_target",
  "serde_json",
  "shlex",
@@ -4298,6 +4300,7 @@ dependencies = [
  "rustc_parse_format",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "rustc_symbol_mangling",
  "rustc_target",
  "rustc_trait_selection",
@@ -4379,6 +4382,7 @@ dependencies = [
  "rustc_serialize",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "rustc_target",
  "tempfile",
  "tracing",
@@ -4580,6 +4584,7 @@ dependencies = [
  "rustc_privacy",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "rustc_target",
  "rustc_trait_selection",
  "tracing",
@@ -4700,6 +4705,7 @@ dependencies = [
  "rustc_middle",
  "rustc_session",
  "rustc_span",
+ "rustc_structures",
  "smallvec",
  "thin-vec",
  "tracing",
@@ -4790,6 +4796,7 @@ dependencies = [
  "rustc_error_messages",
  "rustc_macros",
  "rustc_serialize",
+ "rustc_span",
  "schemars",
  "serde",
 ]

compiler/rustc_attr_ir/src/data_structures.rs

@@ -16,7 +16,7 @@ use rustc_macros::{Decodable, Encodable, PrintAttribute, StableHash};
 use rustc_span::def_id::DefId;
 use rustc_span::hygiene::Transparency;
 use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol};
-use rustc_structures::{Limit, SanitizerSet};
+use rustc_structures::{CrateType, Limit, SanitizerSet};
 use thin_vec::ThinVec;
 
 pub use crate::canonical_symbols::{CanonicalSymbol, CanonicalSymbols};
@@ -691,108 +691,6 @@ pub enum CollapseMacroDebuginfo {
     Yes = 3,
 }
 
-/// Crate type, as specified by `#![crate_type]`
-#[derive(Copy, Clone, Debug, Hash, PartialEq, Default, PartialOrd, Eq, Ord)]
-#[derive(StableHash, Encodable, Decodable, PrintAttribute)]
-pub enum CrateType {
-    /// `#![crate_type = "bin"]`
-    Executable,
-    /// `#![crate_type = "dylib"]`
-    Dylib,
-    /// `#![crate_type = "rlib"]` or `#![crate_type = "lib"]`
-    #[default]
-    Rlib,
-    /// `#![crate_type = "staticlib"]`
-    StaticLib,
-    /// `#![crate_type = "cdylib"]`
-    Cdylib,
-    /// `#![crate_type = "proc-macro"]`
-    ProcMacro,
-    /// `#![crate_type = "sdylib"]`
-    // Unstable; feature(export_stable)
-    Sdylib,
-}
-
-impl CrateType {
-    /// Pairs of each `#[crate_type] = "..."` value and the crate type it resolves to
-    pub fn all() -> &'static [(Symbol, Self)] {
-        debug_assert_eq!(CrateType::default(), CrateType::Rlib);
-        &[
-            (rustc_span::sym::lib, CrateType::Rlib),
-            (rustc_span::sym::rlib, CrateType::Rlib),
-            (rustc_span::sym::dylib, CrateType::Dylib),
-            (rustc_span::sym::cdylib, CrateType::Cdylib),
-            (rustc_span::sym::staticlib, CrateType::StaticLib),
-            (rustc_span::sym::proc_dash_macro, CrateType::ProcMacro),
-            (rustc_span::sym::bin, CrateType::Executable),
-            (rustc_span::sym::sdylib, CrateType::Sdylib),
-        ]
-    }
-
-    /// Same as [`CrateType::all`], but does not include unstable options.
-    /// Used for diagnostics.
-    pub fn all_stable() -> &'static [(Symbol, Self)] {
-        debug_assert_eq!(CrateType::default(), CrateType::Rlib);
-        &[
-            (rustc_span::sym::lib, CrateType::Rlib),
-            (rustc_span::sym::rlib, CrateType::Rlib),
-            (rustc_span::sym::dylib, CrateType::Dylib),
-            (rustc_span::sym::cdylib, CrateType::Cdylib),
-            (rustc_span::sym::staticlib, CrateType::StaticLib),
-            (rustc_span::sym::proc_dash_macro, CrateType::ProcMacro),
-            (rustc_span::sym::bin, CrateType::Executable),
-        ]
-    }
-
-    pub fn has_metadata(self) -> bool {
-        match self {
-            CrateType::Rlib | CrateType::Dylib | CrateType::ProcMacro => true,
-            CrateType::Executable
-            | CrateType::Cdylib
-            | CrateType::StaticLib
-            | CrateType::Sdylib => false,
-        }
-    }
-}
-
-impl TryFrom<Symbol> for CrateType {
-    type Error = ();
-
-    fn try_from(value: Symbol) -> Result<Self, Self::Error> {
-        Ok(match value {
-            rustc_span::sym::bin => CrateType::Executable,
-            rustc_span::sym::dylib => CrateType::Dylib,
-            rustc_span::sym::staticlib => CrateType::StaticLib,
-            rustc_span::sym::cdylib => CrateType::Cdylib,
-            rustc_span::sym::rlib => CrateType::Rlib,
-            rustc_span::sym::lib => CrateType::default(),
-            rustc_span::sym::proc_dash_macro => CrateType::ProcMacro,
-            rustc_span::sym::sdylib => CrateType::Sdylib,
-            _ => return Err(()),
-        })
-    }
-}
-
-impl std::fmt::Display for CrateType {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match *self {
-            CrateType::Executable => "bin".fmt(f),
-            CrateType::Dylib => "dylib".fmt(f),
-            CrateType::Rlib => "rlib".fmt(f),
-            CrateType::StaticLib => "staticlib".fmt(f),
-            CrateType::Cdylib => "cdylib".fmt(f),
-            CrateType::ProcMacro => "proc-macro".fmt(f),
-            CrateType::Sdylib => "sdylib".fmt(f),
-        }
-    }
-}
-
-impl IntoDiagArg for CrateType {
-    fn into_diag_arg(self, _: &mut Option<std::path::PathBuf>) -> DiagArgValue {
-        self.to_string().into_diag_arg(&mut None)
-    }
-}
-
 #[derive(Clone, Debug, StableHash, Encodable, Decodable, PrintAttribute)]
 pub enum RustcDumpLayoutKind {
     Align,

compiler/rustc_attr_ir/src/pretty_printing.rs

@@ -14,7 +14,7 @@ use rustc_data_structures::fx::FxIndexMap;
 use rustc_span::def_id::DefId;
 use rustc_span::hygiene::Transparency;
 use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol};
-use rustc_structures::{Limit, SanitizerSet};
+use rustc_structures::{CrateType, Limit, SanitizerSet};
 use thin_vec::ThinVec;
 
 /// This trait is used to print attributes in `rustc_hir_pretty`.
@@ -207,4 +207,5 @@ print_debug!(
     CfgEntry,
     DiffActivity,
     DiffMode,
+    CrateType,
 );

compiler/rustc_attr_parsing/src/attributes/crate_level.rs

@@ -1,9 +1,10 @@
-use rustc_attr_ir::{CrateType, WindowsSubsystemKind};
+use rustc_attr_ir::WindowsSubsystemKind;
 use rustc_data_structures::fx::FxIndexSet;
 use rustc_feature::AttributeStability;
 use rustc_lint_defs::builtin::{DUPLICATE_TOOLS, UNKNOWN_CRATE_TYPES};
 use rustc_span::Symbol;
 use rustc_span::edit_distance::find_best_match_for_name_with_substrings;
+use rustc_structures::CrateType;
 
 use super::prelude::*;
 use crate::diagnostics::{

compiler/rustc_codegen_cranelift/src/driver/jit.rs

@@ -37,7 +37,7 @@ fn create_jit_module(
 }
 
 pub(crate) fn run_jit(tcx: TyCtxt<'_>, target_cpu: String, jit_args: Vec<String>) -> ! {
-    if !tcx.crate_types().contains(&rustc_session::config::CrateType::Executable) {
+    if !tcx.crate_types().contains(&rustc_structures::CrateType::Executable) {
         tcx.dcx().fatal("can't jit non-executable crate");
     }
 
@@ -180,7 +180,7 @@ fn dep_symbol_lookup_fn(
 
     let mut dylib_paths = Vec::new();
 
-    let data = &crate_info.dependency_formats[&rustc_session::config::CrateType::Executable];
+    let data = &crate_info.dependency_formats[&rustc_structures::CrateType::Executable];
     // `used_crates` is in reverse postorder in terms of dependencies. Reverse the order here to
     // get a postorder which ensures that all dependencies of a dylib are loaded before the dylib
     // itself. This helps the dynamic linker to find dylibs not in the regular dynamic library

compiler/rustc_codegen_llvm/src/context.rs

@@ -21,10 +21,11 @@ use rustc_middle::ty::layout::{
 use rustc_middle::ty::{self, Instance, Ty, TyCtxt};
 use rustc_middle::{bug, span_bug};
 use rustc_session::config::{
-    BranchProtection, CFGuard, CFProtection, CrateType, DebugInfo, FunctionReturn, PAuthKey, PacRet,
+    BranchProtection, CFGuard, CFProtection, DebugInfo, FunctionReturn, PAuthKey, PacRet,
 };
 use rustc_session::{PointerAuthSchema, Session};
 use rustc_span::{DUMMY_SP, Span, Spanned, Symbol, sym};
+use rustc_structures::CrateType;
 use rustc_target::spec::{
     Arch, CfgAbi, Env, FramePointer, HasTargetSpec, Os, RelocModel, SmallDataThresholdSupport,
     Target, TlsModel,

compiler/rustc_codegen_llvm/src/debuginfo/gdb.rs

@@ -6,7 +6,8 @@ use rustc_codegen_ssa::traits::*;
 use rustc_hir::attrs::DebuggerVisualizerType;
 use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_middle::bug;
-use rustc_session::config::{CrateType, DebugInfo};
+use rustc_session::config::DebugInfo;
+use rustc_structures::CrateType;
 
 use crate::builder::Builder;
 use crate::common::CodegenCx;

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -23,9 +23,9 @@ use rustc_middle::ty::layout::{FnAbiOf, HasTyCtxt, HasTypingEnv, LayoutOf};
 use rustc_middle::ty::offload_meta::OffloadMetadata;
 use rustc_middle::ty::{self, GenericArgsRef, Instance, SimdAlign, Ty, TyCtxt, TypingEnv};
 use rustc_middle::{bug, span_bug};
-use rustc_session::config::CrateType;
 use rustc_session::diagnostics::feature_err;
 use rustc_span::{ErrorGuaranteed, Span, Symbol, sym};
+use rustc_structures::CrateType;
 use rustc_symbol_mangling::{
     mangle_internal_symbol, mangle_offload_export, symbol_name_for_instance_in_crate,
 };

compiler/rustc_codegen_llvm/src/mono_item.rs

@@ -11,7 +11,7 @@ use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrs;
 use rustc_middle::mono::Visibility;
 use rustc_middle::ty::layout::{FnAbiOf, HasTypingEnv, LayoutOf};
 use rustc_middle::ty::{self, Instance, Ty, TypeVisitableExt};
-use rustc_session::config::CrateType;
+use rustc_structures::CrateType;
 use rustc_target::callconv::{FnAbi, PassMode};
 use rustc_target::spec::{Arch, RelocModel};
 use tracing::debug;

compiler/rustc_codegen_ssa/Cargo.toml

@@ -32,6 +32,7 @@ rustc_mir_transform = { path = "../rustc_mir_transform" }
 rustc_serialize = { path = "../rustc_serialize" }
 rustc_session = { path = "../rustc_session" }
 rustc_span = { path = "../rustc_span" }
+rustc_structures = { path = "../rustc_structures" }
 rustc_symbol_mangling = { path = "../rustc_symbol_mangling" }
 rustc_target = { path = "../rustc_target" }
 rustc_trait_selection = { path = "../rustc_trait_selection" }