use usize instead of u128 inside AttributeKind::RustcLegacyConstGenerics

Author: Edvin Bryntesson

compiler/rustc_ast_lowering/src/lib.rs

@@ -257,7 +257,7 @@ impl ResolverAstLowering {
             return None;
         }
         find_attr!(tcx.get_all_attrs(def_id), AttributeKind::RustcLegacyConstGenerics{fn_indexes,..} => fn_indexes)
-            .map(|fn_indexes|fn_indexes.iter().map(|(num,_)| *num as usize)
+            .map(|fn_indexes|fn_indexes.iter().map(|(num,_)| *num)
             .collect())
     }
 

compiler/rustc_attr_parsing/src/attributes/rustc_internal.rs

@@ -109,7 +109,7 @@ impl<S: Stage> SingleAttributeParser<S> for RustcLegacyConstGenericsParser {
                 ..
             }) = possible_index
             {
-                parsed_indexes.push((index.0, possible_index.span()));
+                parsed_indexes.push((index.0 as usize, possible_index.span()));
             } else {
                 cx.expected_integer_literal(possible_index.span());
                 return None;

compiler/rustc_hir/src/attrs/data_structures.rs

@@ -868,8 +868,9 @@ pub enum AttributeKind {
 
     /// Represents `#[rustc_layout_scalar_valid_range_start]`.
     RustcLayoutScalarValidRangeStart(Box<u128>, Span),
+
     /// Represents `#[rustc_legacy_const_generics]`
-    RustcLegacyConstGenerics { fn_indexes: ThinVec<(u128, Span)>, attr_span: Span },
+    RustcLegacyConstGenerics { fn_indexes: ThinVec<(usize, Span)>, attr_span: Span },
 
     /// Represents `#[rustc_main]`.
     RustcMain,

compiler/rustc_hir/src/attrs/pretty_printing.rs

@@ -159,7 +159,7 @@ macro_rules! print_tup {
 
 print_tup!(A B C D E F G H);
 print_skip!(Span, (), ErrorGuaranteed);
-print_disp!(u16, u128, bool, NonZero<u32>, Limit);
+print_disp!(u16, u128, usize, bool, NonZero<u32>, Limit);
 print_debug!(
     Symbol,
     Ident,

compiler/rustc_passes/src/check_attr.rs

@@ -1220,7 +1220,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
         &self,
         item: Option<ItemLike<'_>>,
         attr_span: Span,
-        index_list: &ThinVec<(u128, Span)>,
+        index_list: &ThinVec<(usize, Span)>,
     ) {
         let Some(ItemLike::Item(Item {
             kind: ItemKind::Fn { sig: FnSig { decl, .. }, generics, .. },
@@ -1252,12 +1252,12 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
             return;
         }
 
-        let arg_count = decl.inputs.len() as u128 + generics.params.len() as u128;
+        let arg_count = decl.inputs.len() + generics.params.len();
         for (index, span) in index_list {
             if *index >= arg_count {
                 self.dcx().emit_err(errors::RustcLegacyConstGenericsIndexExceed {
                     span: *span,
-                    arg_count: arg_count as usize,
+                    arg_count,
                 });
                 return;
             }

compiler/rustc_resolve/src/lib.rs

@@ -2411,7 +2411,11 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
             return None;
         }
         find_attr!(self.tcx.get_all_attrs(def_id), AttributeKind::RustcLegacyConstGenerics{fn_indexes,..} => fn_indexes)
-            .map(|fn_indexes|fn_indexes.iter().map(|(num,_)| *num as usize)
+            .map(|fn_indexes| {
+                fn_indexes
+                    .iter()
+                    .map(|(num,_)| *num)
+            }
             .collect::<Vec<_>>())
     }