This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
File tree
6 files changed
+122
-243
lines changed- src/librustc_mir/borrow_check
- diagnostics
6 files changed
+122
-243
lines changedLines changed: 3 additions & 10 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
289 | 289 |
| |
290 | 290 |
| |
291 | 291 |
| |
292 |
| - | |
293 |
| - | |
294 |
| - | |
295 |
| - | |
296 |
| - | |
297 |
| - | |
298 |
| - | |
299 |
| - | |
300 |
| - | |
301 |
| - | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
302 | 295 |
| |
303 | 296 |
| |
304 | 297 |
| |
|
Lines changed: 1 addition & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
32 | 32 |
| |
33 | 33 |
| |
34 | 34 |
| |
35 |
| - | |
| 35 | + | |
36 | 36 |
| |
37 | 37 |
| |
38 | 38 |
| |
|
Lines changed: 25 additions & 60 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
4 | 4 |
| |
5 | 5 |
| |
6 | 6 |
| |
7 |
| - | |
8 |
| - | |
| 7 | + | |
9 | 8 |
| |
10 |
| - | |
11 |
| - | |
12 |
| - | |
| 9 | + | |
13 | 10 |
| |
14 | 11 |
| |
15 | 12 |
| |
16 |
| - | |
| 13 | + | |
17 | 14 |
| |
18 |
| - | |
19 |
| - | |
20 |
| - | |
| 15 | + | |
21 | 16 |
| |
22 | 17 |
| |
23 | 18 |
| |
| |||
35 | 30 |
| |
36 | 31 |
| |
37 | 32 |
| |
38 |
| - | |
39 |
| - | |
40 |
| - | |
41 |
| - | |
42 |
| - | |
43 |
| - | |
| 33 | + | |
| 34 | + | |
44 | 35 |
| |
45 | 36 |
| |
46 | 37 |
| |
| |||
49 | 40 |
| |
50 | 41 |
| |
51 | 42 |
| |
52 |
| - | |
53 |
| - | |
54 |
| - | |
55 |
| - | |
56 |
| - | |
57 |
| - | |
58 |
| - | |
59 |
| - | |
60 |
| - | |
61 |
| - | |
| 43 | + | |
62 | 44 |
| |
63 | 45 |
| |
64 | 46 |
| |
| |||
94 | 76 |
| |
95 | 77 |
| |
96 | 78 |
| |
97 |
| - | |
| 79 | + | |
98 | 80 |
| |
99 | 81 |
| |
100 | 82 |
| |
101 |
| - | |
102 |
| - | |
103 |
| - | |
| 83 | + | |
| 84 | + | |
104 | 85 |
| |
105 | 86 |
| |
106 | 87 |
| |
107 | 88 |
| |
108 |
| - | |
| 89 | + | |
109 | 90 |
| |
110 |
| - | |
111 |
| - | |
112 |
| - | |
| 91 | + | |
113 | 92 |
| |
114 | 93 |
| |
115 | 94 |
| |
| |||
118 | 97 |
| |
119 | 98 |
| |
120 | 99 |
| |
121 |
| - | |
122 |
| - | |
123 |
| - | |
124 |
| - | |
125 |
| - | |
126 |
| - | |
127 |
| - | |
128 |
| - | |
129 |
| - | |
130 |
| - | |
131 |
| - | |
132 |
| - | |
133 | 100 |
| |
134 |
| - | |
| 101 | + | |
135 | 102 |
| |
136 | 103 |
| |
137 | 104 |
| |
| |||
141 | 108 |
| |
142 | 109 |
| |
143 | 110 |
| |
144 |
| - | |
| 111 | + | |
145 | 112 |
| |
146 | 113 |
| |
147 | 114 |
| |
| |||
204 | 171 |
| |
205 | 172 |
| |
206 | 173 |
| |
207 |
| - | |
| 174 | + | |
208 | 175 |
| |
209 | 176 |
| |
210 | 177 |
| |
211 | 178 |
| |
212 | 179 |
| |
213 |
| - | |
214 |
| - | |
| 180 | + | |
| 181 | + | |
215 | 182 |
| |
216 | 183 |
| |
217 | 184 |
| |
| |||
227 | 194 |
| |
228 | 195 |
| |
229 | 196 |
| |
230 |
| - | |
| 197 | + | |
231 | 198 |
| |
232 |
| - | |
233 |
| - | |
234 |
| - | |
235 |
| - | |
| 199 | + | |
236 | 200 |
| |
237 | 201 |
| |
238 | 202 |
| |
| |||
251 | 215 |
| |
252 | 216 |
| |
253 | 217 |
| |
254 |
| - | |
| 218 | + | |
255 | 219 |
| |
256 | 220 |
| |
257 | 221 |
| |
| |||
262 | 226 |
| |
263 | 227 |
| |
264 | 228 |
| |
265 |
| - | |
| 229 | + | |
266 | 230 |
| |
267 | 231 |
| |
268 | 232 |
| |
| |||
275 | 239 |
| |
276 | 240 |
| |
277 | 241 |
| |
278 |
| - | |
| 242 | + | |
| 243 | + | |
279 | 244 |
| |
280 | 245 |
| |
281 | 246 |
| |
| |||
305 | 270 |
| |
306 | 271 |
| |
307 | 272 |
| |
308 |
| - | |
| 273 | + | |
309 | 274 |
| |
310 | 275 |
| |
311 | 276 |
| |
312 |
| - | |
| 277 | + | |
313 | 278 |
| |
314 | 279 |
|
Lines changed: 41 additions & 72 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
5 | 5 |
| |
6 | 6 |
| |
7 | 7 |
| |
8 |
| - | |
| 8 | + | |
9 | 9 |
| |
10 | 10 |
| |
11 | 11 |
| |
12 | 12 |
| |
13 | 13 |
| |
14 | 14 |
| |
15 |
| - | |
16 | 15 |
| |
17 | 16 |
| |
18 | 17 |
| |
19 | 18 |
| |
20 | 19 |
| |
21 | 20 |
| |
22 | 21 |
| |
23 |
| - | |
| 22 | + | |
24 | 23 |
| |
25 | 24 |
| |
26 | 25 |
| |
| |||
116 | 115 |
| |
117 | 116 |
| |
118 | 117 |
| |
119 |
| - | |
120 |
| - | |
121 |
| - | |
122 |
| - | |
123 |
| - | |
124 |
| - | |
125 |
| - | |
126 |
| - | |
127 |
| - | |
128 |
| - | |
129 |
| - | |
130 |
| - | |
131 |
| - | |
132 |
| - | |
133 |
| - | |
134 |
| - | |
135 |
| - | |
136 |
| - | |
137 |
| - | |
138 |
| - | |
139 |
| - | |
140 | 118 |
| |
141 | 119 |
| |
142 | 120 |
| |
| |||
454 | 432 |
| |
455 | 433 |
| |
456 | 434 |
| |
457 |
| - | |
458 |
| - | |
459 |
| - | |
460 |
| - | |
461 |
| - | |
| 435 | + | |
462 | 436 |
| |
463 | 437 |
| |
464 | 438 |
| |
465 |
| - | |
| 439 | + | |
466 | 440 |
| |
467 | 441 |
| |
468 | 442 |
| |
469 | 443 |
| |
470 |
| - | |
| 444 | + | |
471 | 445 |
| |
472 | 446 |
| |
473 | 447 |
| |
474 | 448 |
| |
475 | 449 |
| |
476 | 450 |
| |
477 |
| - | |
478 |
| - | |
| 451 | + | |
| 452 | + | |
479 | 453 |
| |
480 | 454 |
| |
481 | 455 |
| |
| |||
491 | 465 |
| |
492 | 466 |
| |
493 | 467 |
| |
494 |
| - | |
495 |
| - | |
496 |
| - | |
497 | 468 |
| |
498 | 469 |
| |
499 | 470 |
| |
| |||
504 | 475 |
| |
505 | 476 |
| |
506 | 477 |
| |
507 |
| - | |
508 |
| - | |
| 478 | + | |
| 479 | + | |
509 | 480 |
| |
510 | 481 |
| |
511 | 482 |
| |
512 |
| - | |
| 483 | + | |
513 | 484 |
| |
514 |
| - | |
| 485 | + | |
515 | 486 |
| |
516 | 487 |
| |
517 | 488 |
| |
518 | 489 |
| |
519 | 490 |
| |
520 |
| - | |
| 491 | + | |
521 | 492 |
| |
522 |
| - | |
| 493 | + | |
523 | 494 |
| |
524 | 495 |
| |
525 | 496 |
| |
| |||
569 | 540 |
| |
570 | 541 |
| |
571 | 542 |
| |
572 |
| - | |
| 543 | + | |
573 | 544 |
| |
574 | 545 |
| |
575 | 546 |
| |
576 | 547 |
| |
577 | 548 |
| |
578 |
| - | |
| 549 | + | |
579 | 550 |
| |
580 | 551 |
| |
581 | 552 |
| |
| |||
593 | 564 |
| |
594 | 565 |
| |
595 | 566 |
| |
596 |
| - | |
| 567 | + | |
597 | 568 |
| |
598 | 569 |
| |
599 | 570 |
| |
| |||
630 | 601 |
| |
631 | 602 |
| |
632 | 603 |
| |
633 |
| - | |
| 604 | + | |
634 | 605 |
| |
635 | 606 |
| |
636 | 607 |
| |
637 |
| - | |
638 |
| - | |
639 | 608 |
| |
640 | 609 |
| |
641 |
| - | |
642 |
| - | |
| 610 | + | |
| 611 | + | |
| 612 | + | |
| 613 | + | |
| 614 | + | |
| 615 | + | |
| 616 | + | |
643 | 617 |
| |
644 |
| - | |
645 |
| - | |
646 |
| - | |
647 |
| - | |
| 618 | + | |
| 619 | + | |
| 620 | + | |
| 621 | + | |
648 | 622 |
| |
649 | 623 |
| |
650 | 624 |
| |
| |||
662 | 636 |
| |
663 | 637 |
| |
664 | 638 |
| |
665 |
| - | |
| 639 | + | |
666 | 640 |
| |
667 | 641 |
| |
668 | 642 |
| |
669 | 643 |
| |
670 | 644 |
| |
671 | 645 |
| |
672 |
| - | |
| 646 | + | |
673 | 647 |
| |
674 | 648 |
| |
675 | 649 |
| |
| |||
713 | 687 |
| |
714 | 688 |
| |
715 | 689 |
| |
716 |
| - | |
| 690 | + | |
717 | 691 |
| |
718 | 692 |
| |
719 | 693 |
| |
720 |
| - | |
721 | 694 |
| |
722 | 695 |
| |
723 | 696 |
| |
| |||
728 | 701 |
| |
729 | 702 |
| |
730 | 703 |
| |
731 |
| - | |
| 704 | + | |
| 705 | + | |
732 | 706 |
| |
733 |
| - | |
| 707 | + | |
| 708 | + | |
734 | 709 |
| |
735 |
| - | |
| 710 | + | |
736 | 711 |
| |
737 |
| - | |
| 712 | + | |
738 | 713 |
| |
739 | 714 |
| |
740 | 715 |
| |
| |||
761 | 736 |
| |
762 | 737 |
| |
763 | 738 |
| |
764 |
| - | |
| 739 | + | |
765 | 740 |
| |
766 | 741 |
| |
767 | 742 |
| |
| |||
854 | 829 |
| |
855 | 830 |
| |
856 | 831 |
| |
857 |
| - | |
858 |
| - | |
859 |
| - | |
860 |
| - | |
861 |
| - | |
| 832 | + | |
862 | 833 |
| |
863 | 834 |
| |
864 | 835 |
| |
865 | 836 |
| |
866 |
| - | |
| 837 | + | |
867 | 838 |
| |
868 | 839 |
| |
869 | 840 |
| |
870 | 841 |
| |
871 | 842 |
| |
872 | 843 |
| |
873 |
| - | |
874 |
| - | |
875 |
| - | |
| 844 | + | |
876 | 845 |
| |
877 | 846 |
| |
878 | 847 |
| |
|
Lines changed: 49 additions & 86 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
2 | 2 |
| |
3 | 3 |
| |
4 | 4 |
| |
5 |
| - | |
6 |
| - | |
7 |
| - | |
8 | 5 |
| |
9 | 6 |
| |
10 | 7 |
| |
11 | 8 |
| |
12 | 9 |
| |
13 |
| - | |
14 | 10 |
| |
15 | 11 |
| |
16 | 12 |
| |
17 | 13 |
| |
18 |
| - | |
19 |
| - | |
| 14 | + | |
| 15 | + | |
20 | 16 |
| |
21 | 17 |
| |
22 | 18 |
| |
| |||
193 | 189 |
| |
194 | 190 |
| |
195 | 191 |
| |
196 |
| - | |
| 192 | + | |
197 | 193 |
| |
198 | 194 |
| |
199 | 195 |
| |
200 |
| - | |
201 |
| - | |
202 | 196 |
| |
203 | 197 |
| |
204 | 198 |
| |
| |||
208 | 202 |
| |
209 | 203 |
| |
210 | 204 |
| |
211 |
| - | |
212 |
| - | |
213 |
| - | |
214 |
| - | |
215 |
| - | |
216 |
| - | |
217 |
| - | |
218 |
| - | |
219 |
| - | |
220 |
| - | |
221 |
| - | |
222 |
| - | |
223 |
| - | |
224 |
| - | |
225 |
| - | |
226 |
| - | |
227 |
| - | |
228 |
| - | |
229 |
| - | |
230 |
| - | |
231 |
| - | |
232 |
| - | |
233 |
| - | |
234 |
| - | |
235 |
| - | |
236 |
| - | |
237 |
| - | |
238 |
| - | |
239 |
| - | |
240 |
| - | |
241 |
| - | |
242 |
| - | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
243 | 210 |
| |
244 | 211 |
| |
245 | 212 |
| |
| |||
255 | 222 |
| |
256 | 223 |
| |
257 | 224 |
| |
258 |
| - | |
259 |
| - | |
| 225 | + | |
260 | 226 |
| |
261 | 227 |
| |
262 | 228 |
| |
| |||
266 | 232 |
| |
267 | 233 |
| |
268 | 234 |
| |
269 |
| - | |
| 235 | + | |
270 | 236 |
| |
271 | 237 |
| |
272 | 238 |
| |
| |||
283 | 249 |
| |
284 | 250 |
| |
285 | 251 |
| |
286 |
| - | |
| 252 | + | |
| 253 | + | |
287 | 254 |
| |
288 | 255 |
| |
289 | 256 |
| |
| |||
308 | 275 |
| |
309 | 276 |
| |
310 | 277 |
| |
311 |
| - | |
| 278 | + | |
| 279 | + | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
312 | 284 |
| |
313 | 285 |
| |
314 | 286 |
| |
315 | 287 |
| |
316 |
| - | |
| 288 | + | |
317 | 289 |
| |
318 | 290 |
| |
319 | 291 |
| |
320 | 292 |
| |
321 | 293 |
| |
322 | 294 |
| |
323 | 295 |
| |
324 |
| - | |
| 296 | + | |
325 | 297 |
| |
326 | 298 |
| |
327 | 299 |
| |
| |||
373 | 345 |
| |
374 | 346 |
| |
375 | 347 |
| |
376 |
| - | |
377 |
| - | |
378 |
| - | |
379 |
| - | |
| 348 | + | |
380 | 349 |
| |
381 | 350 |
| |
382 | 351 |
| |
383 | 352 |
| |
384 |
| - | |
| 353 | + | |
385 | 354 |
| |
386 | 355 |
| |
387 | 356 |
| |
388 | 357 |
| |
389 |
| - | |
390 |
| - | |
| 358 | + | |
391 | 359 |
| |
392 | 360 |
| |
393 | 361 |
| |
| |||
396 | 364 |
| |
397 | 365 |
| |
398 | 366 |
| |
399 |
| - | |
| 367 | + | |
400 | 368 |
| |
401 | 369 |
| |
402 | 370 |
| |
403 | 371 |
| |
404 |
| - | |
405 |
| - | |
| 372 | + | |
406 | 373 |
| |
407 | 374 |
| |
408 | 375 |
| |
409 | 376 |
| |
410 | 377 |
| |
411 |
| - | |
412 |
| - | |
| 378 | + | |
| 379 | + | |
413 | 380 |
| |
414 | 381 |
| |
415 | 382 |
| |
| |||
420 | 387 |
| |
421 | 388 |
| |
422 | 389 |
| |
423 |
| - | |
| 390 | + | |
424 | 391 |
| |
425 | 392 |
| |
426 | 393 |
| |
| |||
442 | 409 |
| |
443 | 410 |
| |
444 | 411 |
| |
445 |
| - | |
446 |
| - | |
447 |
| - | |
| 412 | + | |
448 | 413 |
| |
449 | 414 |
| |
450 | 415 |
| |
451 | 416 |
| |
452 | 417 |
| |
453 | 418 |
| |
454 | 419 |
| |
455 |
| - | |
| 420 | + | |
456 | 421 |
| |
457 | 422 |
| |
458 | 423 |
| |
459 | 424 |
| |
460 | 425 |
| |
461 | 426 |
| |
462 | 427 |
| |
463 |
| - | |
464 |
| - | |
465 |
| - | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
466 | 434 |
| |
467 | 435 |
| |
468 | 436 |
| |
| |||
696 | 664 |
| |
697 | 665 |
| |
698 | 666 |
| |
699 |
| - | |
700 |
| - | |
| 667 | + | |
701 | 668 |
| |
702 | 669 |
| |
703 | 670 |
| |
704 |
| - | |
| 671 | + | |
705 | 672 |
| |
706 |
| - | |
| 673 | + | |
707 | 674 |
| |
708 | 675 |
| |
709 | 676 |
| |
| |||
718 | 685 |
| |
719 | 686 |
| |
720 | 687 |
| |
721 |
| - | |
722 |
| - | |
723 |
| - | |
| 688 | + | |
724 | 689 |
| |
725 | 690 |
| |
726 | 691 |
| |
727 |
| - | |
| 692 | + | |
728 | 693 |
| |
729 | 694 |
| |
730 | 695 |
| |
| |||
734 | 699 |
| |
735 | 700 |
| |
736 | 701 |
| |
737 |
| - | |
| 702 | + | |
738 | 703 |
| |
739 |
| - | |
| 704 | + | |
740 | 705 |
| |
741 | 706 |
| |
742 | 707 |
| |
| |||
753 | 718 |
| |
754 | 719 |
| |
755 | 720 |
| |
756 |
| - | |
| 721 | + | |
757 | 722 |
| |
758 | 723 |
| |
759 | 724 |
| |
| |||
771 | 736 |
| |
772 | 737 |
| |
773 | 738 |
| |
774 |
| - | |
775 |
| - | |
776 |
| - | |
| 739 | + | |
777 | 740 |
| |
778 | 741 |
| |
779 | 742 |
| |
| |||
782 | 745 |
| |
783 | 746 |
| |
784 | 747 |
| |
785 |
| - | |
| 748 | + | |
786 | 749 |
| |
787 | 750 |
| |
788 | 751 |
| |
789 | 752 |
| |
790 | 753 |
| |
791 | 754 |
| |
792 | 755 |
| |
793 |
| - | |
| 756 | + | |
794 | 757 |
| |
795 |
| - | |
| 758 | + | |
796 | 759 |
| |
797 | 760 |
| |
798 | 761 |
| |
799 | 762 |
| |
800 | 763 |
| |
801 |
| - | |
| 764 | + | |
802 | 765 |
| |
803 | 766 |
| |
804 | 767 |
| |
|
Lines changed: 3 additions & 14 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1482 | 1482 |
| |
1483 | 1483 |
| |
1484 | 1484 |
| |
1485 |
| - | |
1486 |
| - | |
| 1485 | + | |
1487 | 1486 |
| |
1488 | 1487 |
| |
1489 | 1488 |
| |
| |||
1561 | 1560 |
| |
1562 | 1561 |
| |
1563 | 1562 |
| |
1564 |
| - | |
1565 |
| - | |
1566 |
| - | |
1567 |
| - | |
1568 |
| - | |
| 1563 | + | |
1569 | 1564 |
| |
1570 | 1565 |
| |
1571 | 1566 |
| |
| |||
1591 | 1586 |
| |
1592 | 1587 |
| |
1593 | 1588 |
| |
1594 |
| - | |
1595 |
| - | |
1596 |
| - | |
1597 |
| - | |
1598 |
| - | |
1599 |
| - | |
1600 |
| - | |
| 1589 | + | |
1601 | 1590 |
| |
1602 | 1591 |
| |
1603 | 1592 |
| |
|
0 commit comments