Refactor inlined items some more

They don't implement FnLikeNode anymore, instead are handled differently
further up in the call tree. Also, keep less information (just def ids
for the args).
This commit is contained in:
Florian Diebold 2016-11-24 18:25:59 +01:00 committed by Florian Diebold
parent dd1491cfbe
commit d0ae2c8142
6 changed files with 91 additions and 102 deletions

View file

@ -521,7 +521,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
// (InlinedItemRef::from_trait_item panics otherwise)
let trait_def_id = trait_item.container.id();
Some(self.encode_inlined_item(
InlinedItemRef::from_trait_item(trait_def_id, ast_item, &tcx.map)
InlinedItemRef::from_trait_item(trait_def_id, ast_item, tcx)
))
} else {
None
@ -594,7 +594,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
ast: if ast {
Some(self.encode_inlined_item(
InlinedItemRef::from_impl_item(impl_def_id, ast_item, &tcx.map)
InlinedItemRef::from_impl_item(impl_def_id, ast_item, tcx)
))
} else {
None
@ -826,7 +826,7 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
hir::ItemConst(..) |
hir::ItemFn(_, _, hir::Constness::Const, ..) => {
Some(self.encode_inlined_item(
InlinedItemRef::from_item(def_id, item, &tcx.map)
InlinedItemRef::from_item(def_id, item, tcx)
))
}
_ => None,