bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

get rid of another unnecessary lifetime macro argument

Browse source
This commit is contained in:
Joshua Nelson 2022-08-11 21:35:33 -05:00
parent 0bedd354ca
commit e188868014
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs
View file

@ -76,9 +76,9 @@ impl ProcessQueryValue<'_, Option<DeprecationEntry>> for Option<Deprecation> {
} }
macro_rules! provide_one { macro_rules! provide_one {
(<$lt:tt> $tcx:ident, $def_id:ident, $other:ident, $cdata:ident, $name:ident => { table }) => { ($tcx:ident, $def_id:ident, $other:ident, $cdata:ident, $name:ident => { table }) => {
provide_one! { provide_one! {
<$lt> $tcx, $def_id, $other, $cdata, $name => { $tcx, $def_id, $other, $cdata, $name => {
$cdata $cdata
.root .root
.tables .tables
@ -89,9 +89,9 @@ macro_rules! provide_one {
} }
} }
}; };
(<$lt:tt> $tcx:ident, $def_id:ident, $other:ident, $cdata:ident, $name:ident => { table_direct }) => { ($tcx:ident, $def_id:ident, $other:ident, $cdata:ident, $name:ident => { table_direct }) => {
provide_one! { provide_one! {
<$lt> $tcx, $def_id, $other, $cdata, $name => { $tcx, $def_id, $other, $cdata, $name => {
// We don't decode `table_direct`, since it's not a Lazy, but an actual value // We don't decode `table_direct`, since it's not a Lazy, but an actual value
$cdata $cdata
.root .root
@ -102,11 +102,11 @@ macro_rules! provide_one {
} }
} }
}; };
(<$lt:tt> $tcx:ident, $def_id:ident, $other:ident, $cdata:ident, $name:ident => $compute:block) => { ($tcx:ident, $def_id:ident, $other:ident, $cdata:ident, $name:ident => $compute:block) => {
fn $name<$lt>( fn $name<'tcx>(
$tcx: TyCtxt<$lt>, $tcx: TyCtxt<'tcx>,
def_id_arg: ty::query::query_keys::$name<$lt>, def_id_arg: ty::query::query_keys::$name<'tcx>,
) -> ty::query::query_values::$name<$lt> { ) -> ty::query::query_values::$name<'tcx> {
let _prof_timer = let _prof_timer =
$tcx.prof.generic_activity(concat!("metadata_decode_entry_", stringify!($name))); $tcx.prof.generic_activity(concat!("metadata_decode_entry_", stringify!($name)));
@ -130,11 +130,11 @@ macro_rules! provide_one {
} }
macro_rules! provide { macro_rules! provide {
(<$lt:tt> $tcx:ident, $def_id:ident, $other:ident, $cdata:ident, ($tcx:ident, $def_id:ident, $other:ident, $cdata:ident,
$($name:ident => { $($compute:tt)* })*) => { $($name:ident => { $($compute:tt)* })*) => {
pub fn provide_extern(providers: &mut ExternProviders) { pub fn provide_extern(providers: &mut ExternProviders) {
$(provide_one! { $(provide_one! {
<$lt> $tcx, $def_id, $other, $cdata, $name => { $($compute)* } $tcx, $def_id, $other, $cdata, $name => { $($compute)* }
})* })*
*providers = ExternProviders { *providers = ExternProviders {
@ -187,7 +187,7 @@ impl IntoArgs for (CrateNum, SimplifiedType) {
} }
} }
provide! { <'tcx> tcx, def_id, other, cdata, provide! { tcx, def_id, other, cdata,
explicit_item_bounds => { table } explicit_item_bounds => { table }
explicit_predicates_of => { table } explicit_predicates_of => { table }
generics_of => { table } generics_of => { table }