diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-10-03 12:24:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-03 12:24:12 +0200 |
| commit | 12e4c780ee68c7d93a1d78bd5b16fb5eb2e64ff0 (patch) | |
| tree | 12ffde716857dc9b61c5184a9c117fefa665405a /compiler/rustc_trait_selection/src/traits | |
| parent | fa1cbac1ea8a5761c8c1a10536b227e6d3987356 (diff) | |
| parent | 2ffaeb5110818c7f0c768c715afecb5bc20b5a18 (diff) | |
| download | rust-12e4c780ee68c7d93a1d78bd5b16fb5eb2e64ff0.tar.gz rust-12e4c780ee68c7d93a1d78bd5b16fb5eb2e64ff0.zip | |
Rollup merge of #116358 - compiler-errors:match, r=lcnr
Rename both of the `Match` relations Both of these names kinda were ambiguous. r? lcnr
Diffstat (limited to 'compiler/rustc_trait_selection/src/traits')
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/select/mod.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/select/mod.rs b/compiler/rustc_trait_selection/src/traits/select/mod.rs index bc9ba85fc9f..9b8853b42ab 100644 --- a/compiler/rustc_trait_selection/src/traits/select/mod.rs +++ b/compiler/rustc_trait_selection/src/traits/select/mod.rs @@ -39,6 +39,7 @@ use rustc_middle::dep_graph::dep_kinds; use rustc_middle::dep_graph::DepNodeIndex; use rustc_middle::mir::interpret::ErrorHandled; use rustc_middle::traits::DefiningAnchor; +use rustc_middle::ty::_match::MatchAgainstFreshVars; use rustc_middle::ty::abstract_const::NotConstEvaluatable; use rustc_middle::ty::fold::BottomUpFolder; use rustc_middle::ty::relate::TypeRelation; @@ -2642,7 +2643,7 @@ impl<'tcx> SelectionContext<'_, 'tcx> { current: ty::PolyTraitPredicate<'tcx>, param_env: ty::ParamEnv<'tcx>, ) -> bool { - let mut matcher = ty::_match::Match::new(self.tcx(), param_env); + let mut matcher = MatchAgainstFreshVars::new(self.tcx(), param_env); matcher.relate(previous, current).is_ok() } |
