Commit 3f59916
authored
Rollup merge of rust-lang#138822 - moxian:unlock, r=joshtriplett
De-Stabilize `file_lock`
This reverts rust-lang#136794
FCP on the tracking issue (rust-lang#130994) passsed successfully rust-lang#130994 (comment) but there are now concerns about the suitability of the proposed API (rust-lang#130994 (comment))
On zullip it was [suggested](https://rust-lang.zulipchat.com/#narrow/channel/219381-t-libs/topic/File.3A.3Atry_lock.20API.3A.20Result.3Cbool.3E/near/506823067) that it would be better to temporarily(?) destabilize the feature ASAP to buy us some more time reflecting on the API.
This PR implements the revert.
The feature is not currently on beta (https://github.com/rust-lang/rust/blob/beta/library/std/src/fs.rs#L672) so a beta backport is not yet neccessary.
If this revert is accepted, the tracking issue (rust-lang#130994) should be reopened1 file changed
+10
-5
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
665 | 665 | | |
666 | 666 | | |
667 | 667 | | |
| 668 | + | |
668 | 669 | | |
669 | 670 | | |
670 | 671 | | |
| |||
673 | 674 | | |
674 | 675 | | |
675 | 676 | | |
676 | | - | |
| 677 | + | |
677 | 678 | | |
678 | 679 | | |
679 | 680 | | |
| |||
717 | 718 | | |
718 | 719 | | |
719 | 720 | | |
| 721 | + | |
720 | 722 | | |
721 | 723 | | |
722 | 724 | | |
| |||
725 | 727 | | |
726 | 728 | | |
727 | 729 | | |
728 | | - | |
| 730 | + | |
729 | 731 | | |
730 | 732 | | |
731 | 733 | | |
| |||
774 | 776 | | |
775 | 777 | | |
776 | 778 | | |
| 779 | + | |
777 | 780 | | |
778 | 781 | | |
779 | 782 | | |
| |||
782 | 785 | | |
783 | 786 | | |
784 | 787 | | |
785 | | - | |
| 788 | + | |
786 | 789 | | |
787 | 790 | | |
788 | 791 | | |
| |||
830 | 833 | | |
831 | 834 | | |
832 | 835 | | |
| 836 | + | |
833 | 837 | | |
834 | 838 | | |
835 | 839 | | |
| |||
838 | 842 | | |
839 | 843 | | |
840 | 844 | | |
841 | | - | |
| 845 | + | |
842 | 846 | | |
843 | 847 | | |
844 | 848 | | |
| |||
866 | 870 | | |
867 | 871 | | |
868 | 872 | | |
| 873 | + | |
869 | 874 | | |
870 | 875 | | |
871 | 876 | | |
| |||
875 | 880 | | |
876 | 881 | | |
877 | 882 | | |
878 | | - | |
| 883 | + | |
879 | 884 | | |
880 | 885 | | |
881 | 886 | | |
| |||
0 commit comments