diff options
| author | Michael Goulet <michael@errs.io> | 2025-04-16 19:47:56 +0000 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2025-04-16 20:05:55 +0000 |
| commit | 3863018d960ad8bf6dd631f31f9d487e4a9880f1 (patch) | |
| tree | a1b28db7f215da5de55fd3e56e6dedb633fd8435 /compiler/rustc_trait_selection/src | |
| parent | c6aad02ddbc1c6bd01d52a08fa78c737f26abfad (diff) | |
| download | rust-3863018d960ad8bf6dd631f31f9d487e4a9880f1.tar.gz rust-3863018d960ad8bf6dd631f31f9d487e4a9880f1.zip | |
Fix replacing supertrait aliases in ReplaceProjectionWith
Diffstat (limited to 'compiler/rustc_trait_selection/src')
| -rw-r--r-- | compiler/rustc_trait_selection/src/solve/inspect/analyse.rs | 8 | ||||
| -rw-r--r-- | compiler/rustc_trait_selection/src/solve/select.rs | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/compiler/rustc_trait_selection/src/solve/inspect/analyse.rs b/compiler/rustc_trait_selection/src/solve/inspect/analyse.rs index 48a05ad29fb..24b87000e32 100644 --- a/compiler/rustc_trait_selection/src/solve/inspect/analyse.rs +++ b/compiler/rustc_trait_selection/src/solve/inspect/analyse.rs @@ -292,7 +292,7 @@ impl<'a, 'tcx> InspectGoal<'a, 'tcx> { inspect::ProbeStep::NestedProbe(ref probe) => { match probe.kind { // These never assemble candidates for the goal we're trying to solve. - inspect::ProbeKind::UpcastProjectionCompatibility + inspect::ProbeKind::ProjectionCompatibility | inspect::ProbeKind::ShadowedEnvProbing => continue, inspect::ProbeKind::NormalizedSelfTyAssembly @@ -314,8 +314,10 @@ impl<'a, 'tcx> InspectGoal<'a, 'tcx> { } match probe.kind { - inspect::ProbeKind::UpcastProjectionCompatibility - | inspect::ProbeKind::ShadowedEnvProbing => bug!(), + inspect::ProbeKind::ProjectionCompatibility + | inspect::ProbeKind::ShadowedEnvProbing => { + bug!() + } inspect::ProbeKind::NormalizedSelfTyAssembly | inspect::ProbeKind::UnsizeAssembly => {} diff --git a/compiler/rustc_trait_selection/src/solve/select.rs b/compiler/rustc_trait_selection/src/solve/select.rs index 4437fc5b029..4fdaf740287 100644 --- a/compiler/rustc_trait_selection/src/solve/select.rs +++ b/compiler/rustc_trait_selection/src/solve/select.rs @@ -177,7 +177,7 @@ fn to_selection<'tcx>( }, ProbeKind::NormalizedSelfTyAssembly | ProbeKind::UnsizeAssembly - | ProbeKind::UpcastProjectionCompatibility + | ProbeKind::ProjectionCompatibility | ProbeKind::OpaqueTypeStorageLookup { result: _ } | ProbeKind::Root { result: _ } | ProbeKind::ShadowedEnvProbing |