Skip to content

Commit a61e2a9

Browse files
FnCtxt normalization stuff
1 parent 82c07f0 commit a61e2a9

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

clippy_utils/src/ty.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ use rustc_span::symbol::Ident;
2222
use rustc_span::{sym, Span, Symbol, DUMMY_SP};
2323
use rustc_target::abi::{Size, VariantIdx};
2424
use rustc_trait_selection::infer::InferCtxtExt;
25-
use rustc_trait_selection::traits::NormalizeExt;
26-
use rustc_trait_selection::traits::query::normalize::AtExt;
25+
use rustc_trait_selection::traits::query::normalize::QueryNormalizeExt;
2726
use std::iter;
2827

2928
use crate::{match_def_path, path_res, paths};
@@ -284,7 +283,7 @@ fn is_normalizable_helper<'tcx>(
284283
cache.insert(ty, false);
285284
let infcx = cx.tcx.infer_ctxt().build();
286285
let cause = rustc_middle::traits::ObligationCause::dummy();
287-
let result = if infcx.at(&cause, param_env).normalize(ty).is_ok() {
286+
let result = if infcx.at(&cause, param_env).query_normalize(ty).is_ok() {
288287
match ty.kind() {
289288
ty::Adt(def, substs) => def.variants().iter().all(|variant| {
290289
variant

0 commit comments

Comments
 (0)