Use &'hir Ty
everywhere.
For consistency, and because it makes HIR measurement simpler and more accurate.
This commit is contained in:
parent
db35b685a7
commit
a847d5e4ce
5 changed files with 6 additions and 6 deletions
|
@ -1152,7 +1152,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
|
||||||
}
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
GenericArg::Type(self.lower_ty_direct(&ty, itctx))
|
GenericArg::Type(self.lower_ty(&ty, itctx))
|
||||||
}
|
}
|
||||||
ast::GenericArg::Const(ct) => GenericArg::Const(ConstArg {
|
ast::GenericArg::Const(ct) => GenericArg::Const(ConstArg {
|
||||||
value: self.lower_anon_const(&ct),
|
value: self.lower_anon_const(&ct),
|
||||||
|
|
|
@ -359,7 +359,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
|
||||||
}
|
}
|
||||||
FnRetTy::Default(_) => self.arena.alloc(self.ty_tup(*span, &[])),
|
FnRetTy::Default(_) => self.arena.alloc(self.ty_tup(*span, &[])),
|
||||||
};
|
};
|
||||||
let args = smallvec![GenericArg::Type(self.ty_tup(*inputs_span, inputs))];
|
let args = smallvec![GenericArg::Type(self.arena.alloc(self.ty_tup(*inputs_span, inputs)))];
|
||||||
let binding = self.output_ty_binding(output_ty.span, output_ty);
|
let binding = self.output_ty_binding(output_ty.span, output_ty);
|
||||||
(
|
(
|
||||||
GenericArgsCtor {
|
GenericArgsCtor {
|
||||||
|
|
|
@ -265,7 +265,7 @@ impl InferArg {
|
||||||
#[derive(Debug, HashStable_Generic)]
|
#[derive(Debug, HashStable_Generic)]
|
||||||
pub enum GenericArg<'hir> {
|
pub enum GenericArg<'hir> {
|
||||||
Lifetime(Lifetime),
|
Lifetime(Lifetime),
|
||||||
Type(Ty<'hir>),
|
Type(&'hir Ty<'hir>),
|
||||||
Const(ConstArg),
|
Const(ConstArg),
|
||||||
Infer(InferArg),
|
Infer(InferArg),
|
||||||
}
|
}
|
||||||
|
@ -3502,7 +3502,7 @@ mod size_asserts {
|
||||||
static_assert_size!(FnDecl<'_>, 40);
|
static_assert_size!(FnDecl<'_>, 40);
|
||||||
static_assert_size!(ForeignItem<'_>, 72);
|
static_assert_size!(ForeignItem<'_>, 72);
|
||||||
static_assert_size!(ForeignItemKind<'_>, 40);
|
static_assert_size!(ForeignItemKind<'_>, 40);
|
||||||
static_assert_size!(GenericArg<'_>, 80);
|
static_assert_size!(GenericArg<'_>, 40);
|
||||||
static_assert_size!(GenericBound<'_>, 48);
|
static_assert_size!(GenericBound<'_>, 48);
|
||||||
static_assert_size!(Generics<'_>, 56);
|
static_assert_size!(Generics<'_>, 56);
|
||||||
static_assert_size!(Impl<'_>, 80);
|
static_assert_size!(Impl<'_>, 80);
|
||||||
|
|
|
@ -105,7 +105,7 @@ fn get_size_of_ty<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) -> Option<
|
||||||
if let Some(def_id) = cx.qpath_res(count_func_qpath, count_func.hir_id).opt_def_id();
|
if let Some(def_id) = cx.qpath_res(count_func_qpath, count_func.hir_id).opt_def_id();
|
||||||
if cx.tcx.is_diagnostic_item(sym::mem_size_of, def_id);
|
if cx.tcx.is_diagnostic_item(sym::mem_size_of, def_id);
|
||||||
then {
|
then {
|
||||||
cx.typeck_results().node_substs(count_func.hir_id).types().next().map(|resolved_ty| (real_ty, resolved_ty))
|
cx.typeck_results().node_substs(count_func.hir_id).types().next().map(|resolved_ty| (*real_ty, resolved_ty))
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|
|
@ -333,7 +333,7 @@ pub fn qpath_generic_tys<'tcx>(qpath: &QPath<'tcx>) -> impl Iterator<Item = &'tc
|
||||||
.map_or(&[][..], |a| a.args)
|
.map_or(&[][..], |a| a.args)
|
||||||
.iter()
|
.iter()
|
||||||
.filter_map(|a| match a {
|
.filter_map(|a| match a {
|
||||||
hir::GenericArg::Type(ty) => Some(ty),
|
hir::GenericArg::Type(ty) => Some(*ty),
|
||||||
_ => None,
|
_ => None,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue