Rollup merge of #145495 - fee1-dead-contrib:push-tynlnktvrmrx, r=Zalathar

Use declarative macro for `#[derive(TryFromU32)]`
cc ``@Zalathar``

Author: matthiaskrgr

compiler/rustc_codegen_llvm/src/coverageinfo/mapgen.rs

@@ -6,7 +6,6 @@ use rustc_abi::Align;
 use rustc_codegen_ssa::traits::{BaseTypeCodegenMethods,ConstCodegenMethods};
 use rustc_data_structures::fx::FxIndexMap;
 use rustc_index::IndexVec;
-use rustc_macros::TryFromU32;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::RemapFileNameExt;
 use rustc_session::config::RemapPathScopeComponents;
@@ -16,7 +15,7 @@ use tracing::debug;
 usecrate::common::CodegenCx;
 usecrate::coverageinfo::llvm_cov;
 usecrate::coverageinfo::mapgen::covfun::prepare_covfun_record;
-usecrate::llvm;
+usecrate::{TryFromU32,llvm};
 
 mod covfun;
 mod spans;

compiler/rustc_codegen_llvm/src/lib.rs

@@ -14,6 +14,7 @@
 #![feature(if_let_guard)]
 #![feature(impl_trait_in_assoc_type)]
 #![feature(iter_intersperse)]
+#![feature(macro_derive)]
 #![feature(rustdoc_internals)]
 #![feature(slice_as_array)]
 #![feature(try_blocks)]
@@ -65,6 +66,7 @@ mod errors;
 mod intrinsic;
 mod llvm;
 mod llvm_util;
+mod macros;
 mod mono_item;
 mod type_;
 mod type_of;
@@ -74,6 +76,8 @@ mod value;
 
 rustc_fluent_macro::fluent_messages! {"../messages.ftl"}
 
+pub(crate)use macros::TryFromU32;
+
 #[derive(Clone)]
 pubstructLlvmCodegenBackend(());
 

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -19,16 +19,15 @@ use std::ptr;
 
 use bitflags::bitflags;
 use libc::{c_char, c_int, c_uchar, c_uint, c_ulonglong, c_void, size_t};
-use rustc_macros::TryFromU32;
 
 usesuper::RustString;
 usesuper::debuginfo::{
 DIArray,DIBuilder,DIDerivedType,DIDescriptor,DIEnumerator,DIFile,DIFlags,
 DIGlobalVariableExpression,DILocation,DISPFlags,DIScope,DISubprogram,
 DITemplateTypeParameter,DIType,DebugEmissionKind,DebugNameTableKind,
 };
-usecrate::llvm;
 usecrate::llvm::MetadataKindId;
+usecrate::{TryFromU32, llvm};
 
 /// In the LLVM-C API, boolean values are passed as `typedef int LLVMBool`,
 /// which has a different ABI from Rust or C++ `bool`.

compiler/rustc_codegen_llvm/src/macros.rs

@@ -0,0 +1,22 @@
+macro_rules!TryFromU32{
+derive()(
+ $(#[$meta:meta])*
+ $vis:vis enum $Type:ident {
+ $(
+ $(#[$varmeta:meta])*
+ $Variant:ident $(= $discr:expr)?
+),* $(,)?
+}
+) => {
+impl::core::convert::TryFrom<u32>for $Type {
+typeError = u32;
+#[allow(deprecated)]// Don't warn about deprecated variants.
+fntry_from(value:u32) -> ::core::result::Result<$Type,Self::Error>{
+ $(if value == const{ $Type::$Variant asu32}{returnOk($Type::$Variant)})*
+Err(value)
+}
+}
+}
+}
+
+pub(crate)useTryFromU32;

compiler/rustc_macros/src/lib.rs

@@ -18,7 +18,6 @@ mod print_attribute;
 mod query;
 mod serialize;
 mod symbols;
-mod try_from;
 mod type_foldable;
 mod type_visitable;
 mod visitable;
@@ -176,14 +175,6 @@ decl_derive!(
  applicability)] => diagnostics::subdiagnostic_derive
 );
 
-decl_derive!{
-[TryFromU32] =>
-/// Derives `TryFrom<u32>` for the annotated `enum`, which must have no fields.
-/// Each variant maps to the value it would produce under an `as u32` cast.
-///
-/// The error type is `u32`.
- try_from::try_from_u32
-}
 decl_derive!{
 [PrintAttribute] =>
 /// Derives `PrintAttribute` for `AttributeKind`.