Rollup merge of #91920 - Aaron1011:pred-stable-cmp, r=oli-obk

matthiaskrgr · web-flow · commit 990cf5bca455 · 2021-12-15T10:57:04.000+01:00
Use `tcx.def_path_hash` in `ExistentialPredicate.stable_cmp`

This avoids a needless query invocation
diff --git a/compiler/rustc_middle/src/ty/sty.rs b/compiler/rustc_middle/src/ty/sty.rs
@@ -787,7 +787,7 @@ impl<'tcx> ExistentialPredicate<'tcx> {
                 tcx.def_path_hash(a.item_def_id).cmp(&tcx.def_path_hash(b.item_def_id))
             }
             (AutoTrait(ref a), AutoTrait(ref b)) => {
-                tcx.trait_def(*a).def_path_hash.cmp(&tcx.trait_def(*b).def_path_hash)
+                tcx.def_path_hash(*a).cmp(&tcx.def_path_hash(*b))
             }
             (Trait(_), _) => Ordering::Less,
             (Projection(_), Trait(_)) => Ordering::Greater,

Original file line number	Diff line number	Diff line change
`@@ -787,7 +787,7 @@ impl<'tcx> ExistentialPredicate<'tcx> {`
`787`	`787`	`tcx.def_path_hash(a.item_def_id).cmp(&tcx.def_path_hash(b.item_def_id))`
`788`	`788`	`}`
`789`	`789`	`(AutoTrait(ref a), AutoTrait(ref b)) => {`
`790`		`- tcx.trait_def(a).def_path_hash.cmp(&tcx.trait_def(b).def_path_hash)`
	`790`	`+ tcx.def_path_hash(a).cmp(&tcx.def_path_hash(b))`
`791`	`791`	`}`
`792`	`792`	`(Trait(_), _) => Ordering::Less,`
`793`	`793`	`(Projection(_), Trait(_)) => Ordering::Greater,`