Commit e32af01
authored
Rollup merge of rust-lang#154712 - lqd:revert-149904, r=jieyouxu
Revert "`-Znext-solver` Remove the forced ambiguity hack from search graph"
This PR reverts rust-lang#149904 as discussed and requested in https://rust-lang.zulipchat.com/#narrow/channel/326866-t-types.2Fnominated/topic/.23153910.3A.20Significant.20compilation.20time.20regression.20starting.20i.E2.80.A6.
We would like a bit of time to investigate without pressure how rust-lang#149904 caused the compile time regression in rust-lang#153910, and the PR is in beta and release is approaching. When that is better understood, and we e.g. have a fix or decide to eat it, we'd want to re-land the original work.
cc @ShoyuVanilla @lcnr2 files changed
Lines changed: 28 additions & 48 deletions
File tree
- compiler/rustc_type_ir/src/search_graph
- tests/ui/traits/next-solver
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
926 | 926 | | |
927 | 927 | | |
928 | 928 | | |
929 | | - | |
930 | | - | |
| 929 | + | |
| 930 | + | |
931 | 931 | | |
| 932 | + | |
932 | 933 | | |
933 | 934 | | |
934 | 935 | | |
| |||
965 | 966 | | |
966 | 967 | | |
967 | 968 | | |
968 | | - | |
| 969 | + | |
969 | 970 | | |
970 | 971 | | |
971 | 972 | | |
| |||
1046 | 1047 | | |
1047 | 1048 | | |
1048 | 1049 | | |
| 1050 | + | |
| 1051 | + | |
| 1052 | + | |
1049 | 1053 | | |
1050 | 1054 | | |
1051 | 1055 | | |
| |||
1362 | 1366 | | |
1363 | 1367 | | |
1364 | 1368 | | |
| 1369 | + | |
| 1370 | + | |
| 1371 | + | |
| 1372 | + | |
| 1373 | + | |
| 1374 | + | |
| 1375 | + | |
| 1376 | + | |
| 1377 | + | |
| 1378 | + | |
| 1379 | + | |
| 1380 | + | |
| 1381 | + | |
| 1382 | + | |
| 1383 | + | |
| 1384 | + | |
| 1385 | + | |
| 1386 | + | |
| 1387 | + | |
| 1388 | + | |
| 1389 | + | |
1365 | 1390 | | |
1366 | 1391 | | |
1367 | 1392 | | |
| |||
Lines changed: 0 additions & 45 deletions
This file was deleted.
0 commit comments