bjoernager/rust
bjoernager/rust
1
Fork 0
Code 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

2
compiler/rustc_middle/src/query/mod.rs
View file

@ -564,7 +564,7 @@ rustc_queries! {
}
/// Collects the associated items defined on a trait or impl.
query associated_items(key: DefId) -> ty::AssociatedItems<'tcx> {
query associated_items(key: DefId) -> ty::AssocItems<'tcx> {
storage(ArenaCacheSelector<'tcx>)
desc { |tcx| "collecting associated items of {}", tcx.def_path_str(key) }
}