This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Commit 4e510da
File tree
10 files changed
+228
-201
lines changed- compiler
- rustc_infer/src/infer
- rustc_next_trait_solver/src/solve
- eval_ctxt
- rustc_trait_selection/src/traits/select
- tests/ui
- coercion
- traits/trait-upcasting
10 files changed
+228
-201
lines changedLines changed: 54 additions & 110 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
92 | 92 |
| |
93 | 93 |
| |
94 | 94 |
| |
95 |
| - | |
96 |
| - | |
97 |
| - | |
98 |
| - | |
99 |
| - | |
100 |
| - | |
| 95 | + | |
101 | 96 |
| |
102 | 97 |
| |
103 | 98 |
| |
| |||
116 | 111 |
| |
117 | 112 |
| |
118 | 113 |
| |
119 |
| - | |
| 114 | + | |
120 | 115 |
| |
121 | 116 |
| |
122 | 117 |
| |
| |||
136 | 131 |
| |
137 | 132 |
| |
138 | 133 |
| |
139 |
| - | |
| 134 | + | |
140 | 135 |
| |
141 | 136 |
| |
142 | 137 |
| |
| |||
154 | 149 |
| |
155 | 150 |
| |
156 | 151 |
| |
157 |
| - | |
158 |
| - | |
159 |
| - | |
160 |
| - | |
| 152 | + | |
161 | 153 |
| |
162 |
| - | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
163 | 172 |
| |
164 | 173 |
| |
165 | 174 |
| |
| |||
192 | 201 |
| |
193 | 202 |
| |
194 | 203 |
| |
195 |
| - | |
| 204 | + | |
196 | 205 |
| |
197 | 206 |
| |
198 | 207 |
| |
| |||
284 | 293 |
| |
285 | 294 |
| |
286 | 295 |
| |
287 |
| - | |
| 296 | + | |
288 | 297 |
| |
289 | 298 |
| |
290 | 299 |
| |
| |||
306 | 315 |
| |
307 | 316 |
| |
308 | 317 |
| |
309 |
| - | |
| 318 | + | |
310 | 319 |
| |
311 | 320 |
| |
312 | 321 |
| |
| |||
316 | 325 |
| |
317 | 326 |
| |
318 | 327 |
| |
319 |
| - | |
320 |
| - | |
321 |
| - | |
322 |
| - | |
323 |
| - | |
324 |
| - | |
| 328 | + | |
325 | 329 |
| |
326 | 330 |
| |
327 |
| - | |
| 331 | + | |
328 | 332 |
| |
329 | 333 |
| |
330 |
| - | |
| 334 | + | |
331 | 335 |
| |
332 | 336 |
| |
333 | 337 |
| |
| |||
338 | 342 |
| |
339 | 343 |
| |
340 | 344 |
| |
341 |
| - | |
342 |
| - | |
343 |
| - | |
344 |
| - | |
345 |
| - | |
346 |
| - | |
| 345 | + | |
347 | 346 |
| |
348 | 347 |
| |
349 |
| - | |
| 348 | + | |
350 | 349 |
| |
351 | 350 |
| |
352 | 351 |
| |
353 | 352 |
| |
354 | 353 |
| |
355 |
| - | |
356 |
| - | |
357 |
| - | |
358 |
| - | |
359 |
| - | |
360 |
| - | |
| 354 | + | |
361 | 355 |
| |
362 | 356 |
| |
363 |
| - | |
| 357 | + | |
364 | 358 |
| |
365 | 359 |
| |
366 | 360 |
| |
367 | 361 |
| |
368 | 362 |
| |
369 |
| - | |
370 |
| - | |
371 |
| - | |
372 |
| - | |
373 |
| - | |
374 |
| - | |
| 363 | + | |
375 | 364 |
| |
376 | 365 |
| |
377 |
| - | |
| 366 | + | |
378 | 367 |
| |
379 | 368 |
| |
380 | 369 |
| |
381 | 370 |
| |
382 | 371 |
| |
383 |
| - | |
384 |
| - | |
385 |
| - | |
386 |
| - | |
387 |
| - | |
388 |
| - | |
| 372 | + | |
389 | 373 |
| |
390 | 374 |
| |
391 | 375 |
| |
392 | 376 |
| |
393 |
| - | |
| 377 | + | |
394 | 378 |
| |
395 | 379 |
| |
396 |
| - | |
| 380 | + | |
397 | 381 |
| |
398 | 382 |
| |
399 |
| - | |
| 383 | + | |
400 | 384 |
| |
401 | 385 |
| |
402 | 386 |
| |
| |||
419 | 403 |
| |
420 | 404 |
| |
421 | 405 |
| |
422 |
| - | |
423 |
| - | |
424 |
| - | |
425 |
| - | |
426 |
| - | |
427 |
| - | |
| 406 | + | |
428 | 407 |
| |
429 | 408 |
| |
430 |
| - | |
| 409 | + | |
431 | 410 |
| |
432 | 411 |
| |
433 | 412 |
| |
434 | 413 |
| |
435 | 414 |
| |
436 |
| - | |
437 |
| - | |
438 |
| - | |
439 |
| - | |
440 |
| - | |
441 |
| - | |
| 415 | + | |
442 | 416 |
| |
443 | 417 |
| |
444 |
| - | |
| 418 | + | |
445 | 419 |
| |
446 | 420 |
| |
447 | 421 |
| |
448 | 422 |
| |
449 | 423 |
| |
450 |
| - | |
451 |
| - | |
452 |
| - | |
453 |
| - | |
454 |
| - | |
455 |
| - | |
| 424 | + | |
456 | 425 |
| |
457 | 426 |
| |
458 |
| - | |
| 427 | + | |
459 | 428 |
| |
460 | 429 |
| |
461 | 430 |
| |
462 | 431 |
| |
463 | 432 |
| |
464 |
| - | |
465 |
| - | |
466 |
| - | |
467 |
| - | |
468 |
| - | |
469 |
| - | |
| 433 | + | |
470 | 434 |
| |
471 | 435 |
| |
472 |
| - | |
| 436 | + | |
473 | 437 |
| |
474 | 438 |
| |
475 | 439 |
| |
476 | 440 |
| |
477 | 441 |
| |
478 |
| - | |
479 |
| - | |
480 |
| - | |
481 |
| - | |
482 |
| - | |
483 |
| - | |
| 442 | + | |
484 | 443 |
| |
485 | 444 |
| |
486 | 445 |
| |
487 |
| - | |
| 446 | + | |
488 | 447 |
| |
489 | 448 |
| |
490 | 449 |
| |
| |||
493 | 452 |
| |
494 | 453 |
| |
495 | 454 |
| |
496 |
| - | |
497 |
| - | |
498 |
| - | |
499 |
| - | |
500 |
| - | |
501 |
| - | |
| 455 | + | |
502 | 456 |
| |
503 | 457 |
| |
504 |
| - | |
| 458 | + | |
505 | 459 |
| |
506 | 460 |
| |
507 | 461 |
| |
508 | 462 |
| |
509 | 463 |
| |
510 |
| - | |
511 |
| - | |
512 |
| - | |
513 |
| - | |
514 |
| - | |
515 |
| - | |
| 464 | + | |
516 | 465 |
| |
517 | 466 |
| |
518 |
| - | |
| 467 | + | |
519 | 468 |
| |
520 | 469 |
| |
521 | 470 |
| |
522 | 471 |
| |
523 | 472 |
| |
524 |
| - | |
525 |
| - | |
526 |
| - | |
527 |
| - | |
528 |
| - | |
529 |
| - | |
| 473 | + | |
530 | 474 |
| |
531 | 475 |
| |
532 |
| - | |
| 476 | + | |
533 | 477 |
| |
534 | 478 |
| |
535 | 479 |
|
Lines changed: 9 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
448 | 448 |
| |
449 | 449 |
| |
450 | 450 |
| |
451 |
| - | |
452 |
| - | |
453 |
| - | |
454 |
| - | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
455 | 455 |
| |
456 | 456 |
| |
457 | 457 |
| |
| |||
840 | 840 |
| |
841 | 841 |
| |
842 | 842 |
| |
| 843 | + | |
| 844 | + | |
843 | 845 |
| |
844 |
| - | |
| 846 | + | |
845 | 847 |
| |
846 |
| - | |
| 848 | + | |
847 | 849 |
| |
848 |
| - | |
| 850 | + | |
849 | 851 |
| |
850 | 852 |
| |
851 | 853 |
| |
|
Lines changed: 29 additions & 20 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
895 | 895 |
| |
896 | 896 |
| |
897 | 897 |
| |
898 |
| - | |
899 |
| - | |
900 |
| - | |
901 |
| - | |
| 898 | + | |
| 899 | + | |
| 900 | + | |
| 901 | + | |
| 902 | + | |
| 903 | + | |
| 904 | + | |
902 | 905 |
| |
903 | 906 |
| |
904 | 907 |
| |
| |||
909 | 912 |
| |
910 | 913 |
| |
911 | 914 |
| |
912 |
| - | |
913 |
| - | |
914 |
| - | |
915 |
| - | |
916 |
| - | |
| 915 | + | |
| 916 | + | |
| 917 | + | |
| 918 | + | |
| 919 | + | |
| 920 | + | |
| 921 | + | |
| 922 | + | |
917 | 923 |
| |
918 | 924 |
| |
919 | 925 |
| |
| |||
934 | 940 |
| |
935 | 941 |
| |
936 | 942 |
| |
937 |
| - | |
| 943 | + | |
| 944 | + | |
| 945 | + | |
| 946 | + | |
| 947 | + | |
| 948 | + | |
938 | 949 |
| |
939 | 950 |
| |
940 | 951 |
| |
| |||
1187 | 1198 |
| |
1188 | 1199 |
| |
1189 | 1200 |
| |
1190 |
| - | |
1191 |
| - | |
1192 |
| - | |
1193 |
| - | |
1194 |
| - | |
1195 |
| - | |
1196 |
| - | |
1197 |
| - | |
| 1201 | + | |
| 1202 | + | |
| 1203 | + | |
| 1204 | + | |
| 1205 | + | |
1198 | 1206 |
| |
1199 |
| - | |
1200 |
| - | |
| 1207 | + | |
| 1208 | + | |
| 1209 | + | |
1201 | 1210 |
| |
1202 | 1211 |
| |
1203 | 1212 |
| |
|
Lines changed: 73 additions & 20 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
16 | 16 |
| |
17 | 17 |
| |
18 | 18 |
| |
| 19 | + | |
19 | 20 |
| |
20 | 21 |
| |
21 | 22 |
| |
| |||
44 | 45 |
| |
45 | 46 |
| |
46 | 47 |
| |
47 |
| - | |
| 48 | + | |
48 | 49 |
| |
49 | 50 |
| |
50 | 51 |
| |
| |||
2579 | 2580 |
| |
2580 | 2581 |
| |
2581 | 2582 |
| |
| 2583 | + | |
| 2584 | + | |
| 2585 | + | |
| 2586 | + | |
| 2587 | + | |
2582 | 2588 |
| |
2583 | 2589 |
| |
2584 |
| - | |
2585 |
| - | |
2586 |
| - | |
2587 |
| - | |
2588 |
| - | |
2589 |
| - | |
2590 |
| - | |
2591 |
| - | |
| 2590 | + | |
| 2591 | + | |
| 2592 | + | |
| 2593 | + | |
| 2594 | + | |
| 2595 | + | |
| 2596 | + | |
| 2597 | + | |
| 2598 | + | |
| 2599 | + | |
| 2600 | + | |
| 2601 | + | |
| 2602 | + | |
| 2603 | + | |
| 2604 | + | |
| 2605 | + | |
| 2606 | + | |
| 2607 | + | |
2592 | 2608 |
| |
2593 | 2609 |
| |
2594 | 2610 |
| |
| |||
2599 | 2615 |
| |
2600 | 2616 |
| |
2601 | 2617 |
| |
2602 |
| - | |
| 2618 | + | |
| 2619 | + | |
2603 | 2620 |
| |
2604 |
| - | |
| 2621 | + | |
2605 | 2622 |
| |
2606 | 2623 |
| |
2607 |
| - | |
2608 |
| - | |
2609 |
| - | |
2610 |
| - | |
2611 |
| - | |
2612 |
| - | |
| 2624 | + | |
| 2625 | + | |
| 2626 | + | |
| 2627 | + | |
| 2628 | + | |
| 2629 | + | |
| 2630 | + | |
| 2631 | + | |
| 2632 | + | |
| 2633 | + | |
| 2634 | + | |
| 2635 | + | |
| 2636 | + | |
| 2637 | + | |
| 2638 | + | |
| 2639 | + | |
| 2640 | + | |
| 2641 | + | |
| 2642 | + | |
| 2643 | + | |
| 2644 | + | |
| 2645 | + | |
| 2646 | + | |
| 2647 | + | |
| 2648 | + | |
2613 | 2649 |
| |
2614 |
| - | |
| 2650 | + | |
| 2651 | + | |
2615 | 2652 |
| |
2616 | 2653 |
| |
2617 | 2654 |
| |
2618 | 2655 |
| |
2619 | 2656 |
| |
2620 | 2657 |
| |
2621 | 2658 |
| |
2622 |
| - | |
2623 |
| - | |
| 2659 | + | |
| 2660 | + | |
| 2661 | + | |
| 2662 | + | |
| 2663 | + | |
| 2664 | + | |
| 2665 | + | |
| 2666 | + | |
| 2667 | + | |
| 2668 | + | |
| 2669 | + | |
| 2670 | + | |
| 2671 | + | |
| 2672 | + | |
| 2673 | + | |
| 2674 | + | |
| 2675 | + | |
| 2676 | + | |
2624 | 2677 |
| |
2625 | 2678 |
| |
2626 | 2679 |
| |
|
Lines changed: 27 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + |
Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 6 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 | 2 |
| |
3 | 3 |
| |
| 4 | + | |
4 | 5 |
| |
5 | 6 |
| |
6 | 7 |
| |
7 | 8 |
| |
| 9 | + | |
8 | 10 |
| |
9 |
| - | |
10 |
| - | |
11 | 11 |
| |
| 12 | + | |
12 | 13 |
| |
13 | 14 |
| |
14 | 15 |
| |
15 | 16 |
| |
16 | 17 |
| |
17 |
| - | |
18 |
| - | |
| 18 | + | |
19 | 19 |
| |
| 20 | + | |
| 21 | + |
Lines changed: 4 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
4 | 4 |
| |
5 | 5 |
| |
6 | 6 |
| |
7 |
| - | |
8 |
| - | |
| 7 | + | |
| 8 | + | |
9 | 9 |
| |
10 | 10 |
| |
11 | 11 |
| |
12 | 12 |
| |
13 | 13 |
| |
14 | 14 |
| |
15 | 15 |
| |
16 |
| - | |
17 |
| - | |
| 16 | + | |
| 17 | + | |
18 | 18 |
| |
19 | 19 |
| |
20 | 20 |
| |
|
Lines changed: 26 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + |
0 commit comments