commit 5c0824a599f2f1f4dcb9c92edf09f6c1b555988d
author Chris Wailes <chriswailes@google.com> Mon Apr 24 16:30:59 2023 -0700
committer Chris Wailes <chriswailes@google.com> Mon Apr 24 16:30:59 2023 -0700
tree 84400329016dd275ec8c785d5f86383f6bf901f7
parent d720b3f2ba07cb42ff7b311589c99daefe3aaa22

Importing rustc-1.69.0

Bug: 274972941
Test: ./build.py --lto=thin
Change-Id: I8da91809e193d3c51b2c3ec697b29df9fbb22ffa

compiler/rustc_middle/src/traits/query.rs

diff --git a/compiler/rustc_middle/src/traits/query.rs b/compiler/rustc_middle/src/traits/query.rs
index 615154a..c4f8718 100644
--- a/compiler/rustc_middle/src/traits/query.rs
+++ b/compiler/rustc_middle/src/traits/query.rs
@@ -14,7 +14,7 @@
 
 pub mod type_op {
     use crate::ty::fold::TypeFoldable;
-    use crate::ty::{Predicate, Ty, UserType};
+    use crate::ty::{Predicate, Ty, TyCtxt, UserType};
     use std::fmt;
 
     #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, HashStable, Lift)]
@@ -64,7 +64,7 @@
 
     impl<'tcx, T> Normalize<T>
     where
-        T: fmt::Debug + TypeFoldable<'tcx>,
+        T: fmt::Debug + TypeFoldable<TyCtxt<'tcx>>,
     {
         pub fn new(value: T) -> Self {
             Self { value }