From 82c07f09e52379c8388abd8ca5ea6df246f686b1 Mon Sep 17 00:00:00 2001
From: Michael Goulet <michael@errs.io>
Date: Fri, 25 Nov 2022 17:11:15 +0000
Subject: [PATCH 1/2] partially_normalize_... -> At::normalize
---
clippy_utils/src/ty.rs | 1 +
1 file changed, 1 insertion(+)
diff --git a/clippy_utils/src/ty.rs b/clippy_utils/src/ty.rs
index f4459e3e663..82496f120e3 100644
--- a/clippy_utils/src/ty.rs
+++ b/clippy_utils/src/ty.rs
@@ -22,6 +22,7 @@ use rustc_span::symbol::Ident;
use rustc_span::{sym, Span, Symbol, DUMMY_SP};
use rustc_target::abi::{Size, VariantIdx};
use rustc_trait_selection::infer::InferCtxtExt;
+use rustc_trait_selection::traits::NormalizeExt;
use rustc_trait_selection::traits::query::normalize::AtExt;
use std::iter;
From a61e2a91f5071719f3ac4696ee3061c171a47798 Mon Sep 17 00:00:00 2001
From: Michael Goulet <michael@errs.io>
Date: Fri, 25 Nov 2022 17:28:50 +0000
Subject: [PATCH 2/2] FnCtxt normalization stuff
---
clippy_utils/src/ty.rs | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/clippy_utils/src/ty.rs b/clippy_utils/src/ty.rs
index 82496f120e3..2ceda3511fe 100644
--- a/clippy_utils/src/ty.rs
+++ b/clippy_utils/src/ty.rs
@@ -22,8 +22,7 @@ use rustc_span::symbol::Ident;
use rustc_span::{sym, Span, Symbol, DUMMY_SP};
use rustc_target::abi::{Size, VariantIdx};
use rustc_trait_selection::infer::InferCtxtExt;
-use rustc_trait_selection::traits::NormalizeExt;
-use rustc_trait_selection::traits::query::normalize::AtExt;
+use rustc_trait_selection::traits::query::normalize::QueryNormalizeExt;
use std::iter;
use crate::{match_def_path, path_res, paths};
@@ -284,7 +283,7 @@ fn is_normalizable_helper<'tcx>(
cache.insert(ty, false);
let infcx = cx.tcx.infer_ctxt().build();
let cause = rustc_middle::traits::ObligationCause::dummy();
- let result = if infcx.at(&cause, param_env).normalize(ty).is_ok() {
+ let result = if infcx.at(&cause, param_env).query_normalize(ty).is_ok() {
match ty.kind() {
ty::Adt(def, substs) => def.variants().iter().all(|variant| {
variant