bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

resolve conflicts

Browse source 
resolve conflicts
This commit is contained in:
hi-rustin 2021-04-05 22:54:50 +08:00
parent 115e216067
commit 6c3f5b8535
5 changed files with 8 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_ty_utils/src/ty.rs
View file

@ -210,9 +210,9 @@ fn associated_item_def_ids(tcx: TyCtxt<'_>, def_id: DefId) -> &[DefId] {
}
}
fn associated_items(tcx: TyCtxt<'_>, def_id: DefId) -> ty::AssociatedItems<'_> {
fn associated_items(tcx: TyCtxt<'_>, def_id: DefId) -> ty::AssocItems<'_> {
let items = tcx.associated_item_def_ids(def_id).iter().map(|did| tcx.associated_item(*did));
ty::AssociatedItems::new(items)
ty::AssocItems::new(items)
}
fn def_ident_span(tcx: TyCtxt<'_>, def_id: DefId) -> Option<Span> {