Commit 6d88291
authored
Rollup merge of rust-lang#138797 - compiler-errors:global-proven-via, r=lcnr
Fix `ProvenVia` for global where clauses
When we're merging one (or more) global where clauses in the presence of no other candidates, ensure that we return `TraitGoalProvenVia::ParamEnv` so that rigid projections work correctly. This fixes some tests with `feature(trivial_bounds)`.
Fixes rust-lang#139408File tree
2 files changed
+13
-2
lines changed- compiler/rustc_next_trait_solver/src/solve
- tests/ui/codegen
2 files changed
+13
-2
lines changedLines changed: 10 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1301 | 1301 | | |
1302 | 1302 | | |
1303 | 1303 | | |
1304 | | - | |
1305 | 1304 | | |
1306 | 1305 | | |
1307 | 1306 | | |
| |||
1322 | 1321 | | |
1323 | 1322 | | |
1324 | 1323 | | |
| 1324 | + | |
| 1325 | + | |
| 1326 | + | |
| 1327 | + | |
| 1328 | + | |
| 1329 | + | |
| 1330 | + | |
| 1331 | + | |
| 1332 | + | |
1325 | 1333 | | |
1326 | 1334 | | |
1327 | | - | |
| 1335 | + | |
1328 | 1336 | | |
1329 | 1337 | | |
1330 | 1338 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
1 | 4 | | |
2 | 5 | | |
3 | 6 | | |
| |||
0 commit comments