git.iko.soy/helix
on master help sign in
update MSRV to 1.65
ccdb144Pascal Kuthe
.github/workflows/build.yml+3−3
compare with master
unifiedsplit
@@ -37,7 +37,7 @@ jobs:
37 uses: actions/checkout@v3
37 uses: actions/checkout@v3
38
38
39 - name: Install stable toolchain
39 - name: Install stable toolchain
40− uses: dtolnay/rust-toolchain@1.63
40+ uses: dtolnay/rust-toolchain@1.65
41
41
42 - uses: Swatinem/rust-cache@v2
42 - uses: Swatinem/rust-cache@v2
43
43
@@ -66,7 +66,7 @@ jobs:
66 uses: actions/checkout@v3
66 uses: actions/checkout@v3
67
67
68 - name: Install stable toolchain
68 - name: Install stable toolchain
69− uses: dtolnay/rust-toolchain@1.63
69+ uses: dtolnay/rust-toolchain@1.65
70 with:
70 with:
71 components: rustfmt, clippy
71 components: rustfmt, clippy
72
72
@@ -91,7 +91,7 @@ jobs:
91 uses: actions/checkout@v3
91 uses: actions/checkout@v3
92
92
93 - name: Install stable toolchain
93 - name: Install stable toolchain
94− uses: dtolnay/rust-toolchain@1.63
94+ uses: dtolnay/rust-toolchain@1.65
95
95
96 - uses: Swatinem/rust-cache@v2
96 - uses: Swatinem/rust-cache@v2
97
97
Cargo.lock+68−168
@@ -61,15 +61,6 @@ version = "1.6.0"
61source = "registry+https://github.com/rust-lang/crates.io-index"
61source = "registry+https://github.com/rust-lang/crates.io-index"
62checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
62checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
63
63
64−[[package]]
65−name = "atoi"
66−version = "2.0.0"
67−source = "registry+https://github.com/rust-lang/crates.io-index"
68−checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
69−dependencies = [
70− "num-traits",
71−]
72−
73[[package]]
64[[package]]
74name = "autocfg"
65name = "autocfg"
75version = "1.1.0"
66version = "1.1.0"
@@ -107,9 +98,9 @@ dependencies = [
107
98
108[[package]]
99[[package]]
109name = "btoi"
100name = "btoi"
110−version = "0.4.2"
101+version = "0.4.3"
111source = "registry+https://github.com/rust-lang/crates.io-index"
102source = "registry+https://github.com/rust-lang/crates.io-index"
112−checksum = "97c0869a9faa81f8bbf8102371105d6d0a7b79167a04c340b04ab16892246a11"
103+checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad"
113dependencies = [
104dependencies = [
114 "num-traits",
105 "num-traits",
115]
106]
@@ -132,27 +123,12 @@ version = "1.3.0"
132source = "registry+https://github.com/rust-lang/crates.io-index"
123source = "registry+https://github.com/rust-lang/crates.io-index"
133checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
124checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
134
125
135−[[package]]
136−name = "bytesize"
137−version = "1.1.0"
138−source = "registry+https://github.com/rust-lang/crates.io-index"
139−checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70"
140−
141[[package]]
126[[package]]
142name = "cassowary"
127name = "cassowary"
143version = "0.3.0"
128version = "0.3.0"
144source = "registry+https://github.com/rust-lang/crates.io-index"
129source = "registry+https://github.com/rust-lang/crates.io-index"
145checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
130checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
146
131
147−[[package]]
148−name = "castaway"
149−version = "0.2.2"
150−source = "registry+https://github.com/rust-lang/crates.io-index"
151−checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc"
152−dependencies = [
153− "rustversion",
154−]
155−
156[[package]]
132[[package]]
157name = "cc"
133name = "cc"
158version = "1.0.79"
134version = "1.0.79"
@@ -215,17 +191,6 @@ dependencies = [
215 "unicode-width",
191 "unicode-width",
216]
192]
217
193
218−[[package]]
219−name = "compact_str"
220−version = "0.6.1"
221−source = "registry+https://github.com/rust-lang/crates.io-index"
222−checksum = "5138945395949e7dfba09646dc9e766b548ff48e23deb5246890e6b64ae9e1b9"
223−dependencies = [
224− "castaway",
225− "itoa",
226− "ryu",
227−]
228−
229[[package]]
194[[package]]
230name = "content_inspector"
195name = "content_inspector"
231version = "0.2.4"
196version = "0.2.4"
@@ -270,7 +235,7 @@ dependencies = [
270 "futures-core",
235 "futures-core",
271 "libc",
236 "libc",
272 "mio",
237 "mio",
273− "parking_lot 0.12.1",
238+ "parking_lot",
274 "signal-hook",
239 "signal-hook",
275 "signal-hook-mio",
240 "signal-hook-mio",
276 "winapi",
241 "winapi",
@@ -329,19 +294,6 @@ dependencies = [
329 "syn",
294 "syn",
330]
295]
331
296
332−[[package]]
333−name = "dashmap"
334−version = "5.4.0"
335−source = "registry+https://github.com/rust-lang/crates.io-index"
336−checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
337−dependencies = [
338− "cfg-if",
339− "hashbrown 0.12.3",
340− "lock_api",
341− "once_cell",
342− "parking_lot_core 0.9.4",
343−]
344−
345[[package]]
297[[package]]
346name = "dirs"
298name = "dirs"
347version = "4.0.0"
299version = "4.0.0"
@@ -568,9 +520,9 @@ dependencies = [
568
520
569[[package]]
521[[package]]
570name = "gix"
522name = "gix"
571−version = "0.36.1"
523+version = "0.39.0"
572source = "registry+https://github.com/rust-lang/crates.io-index"
524source = "registry+https://github.com/rust-lang/crates.io-index"
573−checksum = "f3d5dbcb1efbee862cdc851a23377e1a8a5c1a8971740b4933d4ce022a0889a8"
525+checksum = "dabfac58aecb4a38cdd2568de66eb1f0d968fd6726f5a80cb8bea7944ef10cc0"
574dependencies = [
526dependencies = [
575 "gix-actor",
527 "gix-actor",
576 "gix-attributes",
528 "gix-attributes",
@@ -602,7 +554,6 @@ dependencies = [
602 "gix-worktree",
554 "gix-worktree",
603 "log",
555 "log",
604 "once_cell",
556 "once_cell",
605− "prodash",
606 "signal-hook",
557 "signal-hook",
607 "smallvec",
558 "smallvec",
608 "thiserror",
559 "thiserror",
@@ -611,26 +562,25 @@ dependencies = [
611
562
612[[package]]
563[[package]]
613name = "gix-actor"
564name = "gix-actor"
614−version = "0.17.2"
565+version = "0.19.0"
615source = "registry+https://github.com/rust-lang/crates.io-index"
566source = "registry+https://github.com/rust-lang/crates.io-index"
616−checksum = "381153ea93b9d8a5c6894a5c734b2e9c15d623063adfd2bda4342ecf90f9a5f8"
567+checksum = "dc22b0cdc52237667c301dd7cdc6ead8f8f73c9f824e9942c8ebd6b764f6c0bf"
617dependencies = [
568dependencies = [
618 "bstr 1.3.0",
569 "bstr 1.3.0",
619 "btoi",
570 "btoi",
620 "gix-date",
571 "gix-date",
621 "itoa",
572 "itoa",
622 "nom",
573 "nom",
623− "quick-error",
574+ "thiserror",
624]
575]
625
576
626[[package]]
577[[package]]
627name = "gix-attributes"
578name = "gix-attributes"
628−version = "0.8.3"
579+version = "0.10.0"
629source = "registry+https://github.com/rust-lang/crates.io-index"
580source = "registry+https://github.com/rust-lang/crates.io-index"
630−checksum = "df09b20424fd4cee04c43b50df954c4b119c45b769639b60d80ee8bb6d84e0aa"
581+checksum = "2231a25934a240d0a4b6f4478401c73ee81d8be52de0293eedbc172334abf3e1"
631dependencies = [
582dependencies = [
632 "bstr 1.3.0",
583 "bstr 1.3.0",
633− "compact_str",
634 "gix-features",
584 "gix-features",
635 "gix-glob",
585 "gix-glob",
636 "gix-path",
586 "gix-path",
@@ -641,11 +591,11 @@ dependencies = [
641
591
642[[package]]
592[[package]]
643name = "gix-bitmap"
593name = "gix-bitmap"
644−version = "0.2.1"
594+version = "0.2.2"
645source = "registry+https://github.com/rust-lang/crates.io-index"
595source = "registry+https://github.com/rust-lang/crates.io-index"
646−checksum = "5229fd26e288f417c8dd2385c5bc740415eb55aba4d6f529db7ad4b526771e06"
596+checksum = "024bca0c7187517bda5ea24ab148c9ca8208dd0c3e2bea88cdb2008f91791a6d"
647dependencies = [
597dependencies = [
648− "quick-error",
598+ "thiserror",
649]
599]
650
600
651[[package]]
601[[package]]
@@ -668,9 +618,9 @@ dependencies = [
668
618
669[[package]]
619[[package]]
670name = "gix-config"
620name = "gix-config"
671−version = "0.16.2"
621+version = "0.18.0"
672source = "registry+https://github.com/rust-lang/crates.io-index"
622source = "registry+https://github.com/rust-lang/crates.io-index"
673−checksum = "398b5003d5e4991355528e8fbb4a9d532050c8327df790522735a711db82fcd0"
623+checksum = "52c62e26ce11f607712e4f49a0a192ed87675d30187fd61be070abbd607d12f1"
674dependencies = [
624dependencies = [
675 "bstr 1.3.0",
625 "bstr 1.3.0",
676 "gix-config-value",
626 "gix-config-value",
@@ -702,9 +652,9 @@ dependencies = [
702
652
703[[package]]
653[[package]]
704name = "gix-credentials"
654name = "gix-credentials"
705−version = "0.9.2"
655+version = "0.11.0"
706source = "registry+https://github.com/rust-lang/crates.io-index"
656source = "registry+https://github.com/rust-lang/crates.io-index"
707−checksum = "5d1536399f70146825bd10321adc5307032e3de93f4954a3c54184281f2e6955"
657+checksum = "5be32b5fe339a31b8e53fa854081dc914c45020dcb64637f3c21baf69c96fc1b"
708dependencies = [
658dependencies = [
709 "bstr 1.3.0",
659 "bstr 1.3.0",
710 "gix-command",
660 "gix-command",
@@ -730,9 +680,9 @@ dependencies = [
730
680
731[[package]]
681[[package]]
732name = "gix-diff"
682name = "gix-diff"
733−version = "0.26.1"
683+version = "0.28.0"
734source = "registry+https://github.com/rust-lang/crates.io-index"
684source = "registry+https://github.com/rust-lang/crates.io-index"
735−checksum = "2ec3351a6cec2ddca29c1124afef8b4f3fad0b617dce8916148153541468117c"
685+checksum = "585b0834d4b6791a848637c4e109545fda9b0f29b591ba55edb33ceda6e7856b"
736dependencies = [
686dependencies = [
737 "gix-hash",
687 "gix-hash",
738 "gix-object",
688 "gix-object",
@@ -742,9 +692,9 @@ dependencies = [
742
692
743[[package]]
693[[package]]
744name = "gix-discover"
694name = "gix-discover"
745−version = "0.13.1"
695+version = "0.15.0"
746source = "registry+https://github.com/rust-lang/crates.io-index"
696source = "registry+https://github.com/rust-lang/crates.io-index"
747−checksum = "38029783886cb46fbe63e61b02a70404aa04cfeacfb53ed336832c20fcb1e281"
697+checksum = "91c204adba5ebd211c74735cbb65817d277e154486bac0dffa3701f163b80350"
748dependencies = [
698dependencies = [
749 "bstr 1.3.0",
699 "bstr 1.3.0",
750 "dunce",
700 "dunce",
@@ -757,9 +707,9 @@ dependencies = [
757
707
758[[package]]
708[[package]]
759name = "gix-features"
709name = "gix-features"
760−version = "0.26.5"
710+version = "0.28.0"
761source = "registry+https://github.com/rust-lang/crates.io-index"
711source = "registry+https://github.com/rust-lang/crates.io-index"
762−checksum = "3402b831ea4bb3af36369d61dbf250eb0e1a8577d3cb77b9719c11a82485bfe9"
712+checksum = "5e6a9dfa7b3c1a99315203e8b97f8f99f3bd95731590607abeaa5ca31bc41fe3"
763dependencies = [
713dependencies = [
764 "crc32fast",
714 "crc32fast",
765 "flate2",
715 "flate2",
@@ -767,8 +717,8 @@ dependencies = [
767 "libc",
717 "libc",
768 "once_cell",
718 "once_cell",
769 "prodash",
719 "prodash",
770− "quick-error",
771 "sha1_smol",
720 "sha1_smol",
721+ "thiserror",
772 "walkdir",
722 "walkdir",
773]
723]
774
724
@@ -794,23 +744,24 @@ dependencies = [
794
744
795[[package]]
745[[package]]
796name = "gix-hashtable"
746name = "gix-hashtable"
797−version = "0.1.1"
747+version = "0.1.2"
798source = "registry+https://github.com/rust-lang/crates.io-index"
748source = "registry+https://github.com/rust-lang/crates.io-index"
799−checksum = "1a256cceeea0f0d7f42a0c3ac649535644a04395d9f415518f4008ef6bb331b5"
749+checksum = "9609c1b8f36f12968e6a6098f7cdb52004f7d42d570f47a2d6d7c16612f19acb"
800dependencies = [
750dependencies = [
801 "gix-hash",
751 "gix-hash",
802 "hashbrown 0.13.2",
752 "hashbrown 0.13.2",
753+ "parking_lot",
803]
754]
804
755
805[[package]]
756[[package]]
806name = "gix-index"
757name = "gix-index"
807−version = "0.12.4"
758+version = "0.14.0"
808source = "registry+https://github.com/rust-lang/crates.io-index"
759source = "registry+https://github.com/rust-lang/crates.io-index"
809−checksum = "decb345476c25434a202f1cf8a24aa71133c567b7b502c549fd57211c51ed78a"
760+checksum = "c12caf7886c7ba06f2b28835cdc2be1dca86bd047d00299d2d49e707ce1c2616"
810dependencies = [
761dependencies = [
811− "atoi",
812 "bitflags",
762 "bitflags",
813 "bstr 1.3.0",
763 "bstr 1.3.0",
764+ "btoi",
814 "filetime",
765 "filetime",
815 "gix-bitmap",
766 "gix-bitmap",
816 "gix-features",
767 "gix-features",
@@ -826,31 +777,31 @@ dependencies = [
826
777
827[[package]]
778[[package]]
828name = "gix-lock"
779name = "gix-lock"
829−version = "3.0.2"
780+version = "4.0.0"
830source = "registry+https://github.com/rust-lang/crates.io-index"
781source = "registry+https://github.com/rust-lang/crates.io-index"
831−checksum = "e5fe84f09afadec78a7227d80f58cb5412d216dbae4b7fa060b619c0ce62b55d"
782+checksum = "66119ff8a4a395d0ea033fef718bc85f8b4f0855874f4ce1e005fc16cfe1f66e"
832dependencies = [
783dependencies = [
833 "fastrand",
784 "fastrand",
834 "gix-tempfile",
785 "gix-tempfile",
835− "quick-error",
786+ "thiserror",
836]
787]
837
788
838[[package]]
789[[package]]
839name = "gix-mailmap"
790name = "gix-mailmap"
840−version = "0.9.3"
791+version = "0.11.0"
841source = "registry+https://github.com/rust-lang/crates.io-index"
792source = "registry+https://github.com/rust-lang/crates.io-index"
842−checksum = "a28214e75835ab33d34210a18981110642728bf169f5e339dbfb6f6380b94318"
793+checksum = "2b66aea5e52875cd4915f4957a6f4b75831a36981e2ec3f5fad9e370e444fe1a"
843dependencies = [
794dependencies = [
844 "bstr 1.3.0",
795 "bstr 1.3.0",
845 "gix-actor",
796 "gix-actor",
846− "quick-error",
797+ "thiserror",
847]
798]
848
799
849[[package]]
800[[package]]
850name = "gix-object"
801name = "gix-object"
851−version = "0.26.2"
802+version = "0.28.0"
852source = "registry+https://github.com/rust-lang/crates.io-index"
803source = "registry+https://github.com/rust-lang/crates.io-index"
853−checksum = "de3b04e3028ddab838d005104f234f4d2c26ecd51f2d72d96747c878094c4619"
804+checksum = "8df068db9180ee935fbb70504848369e270bdcb576b05c0faa8b9fd3b86fc017"
854dependencies = [
805dependencies = [
855 "bstr 1.3.0",
806 "bstr 1.3.0",
856 "btoi",
807 "btoi",
@@ -867,9 +818,9 @@ dependencies = [
867
818
868[[package]]
819[[package]]
869name = "gix-odb"
820name = "gix-odb"
870−version = "0.40.2"
821+version = "0.42.0"
871source = "registry+https://github.com/rust-lang/crates.io-index"
822source = "registry+https://github.com/rust-lang/crates.io-index"
872−checksum = "0bd81ab7cd13c0f78bd619f967509953094f415288f8693dbb63a084e5bb39c4"
823+checksum = "e9a5f9e1afbd509761977a2ea02869cedaaba500b4e783deb2e4de5179a55a80"
873dependencies = [
824dependencies = [
874 "arc-swap",
825 "arc-swap",
875 "gix-features",
826 "gix-features",
@@ -878,20 +829,18 @@ dependencies = [
878 "gix-pack",
829 "gix-pack",
879 "gix-path",
830 "gix-path",
880 "gix-quote",
831 "gix-quote",
881− "parking_lot 0.12.1",
832+ "parking_lot",
882 "tempfile",
833 "tempfile",
883 "thiserror",
834 "thiserror",
884]
835]
885
836
886[[package]]
837[[package]]
887name = "gix-pack"
838name = "gix-pack"
888−version = "0.30.3"
839+version = "0.32.0"
889source = "registry+https://github.com/rust-lang/crates.io-index"
840source = "registry+https://github.com/rust-lang/crates.io-index"
890−checksum = "26143c5c8bc145a39e9b335cc74504f2eba2ce68b1724661d8e6cb4484ab187e"
841+checksum = "e51db84e1459a8022e518d40a8778028d793dbb28e4d35c9a5eaf92658fb0775"
891dependencies = [
842dependencies = [
892− "bytesize",
893 "clru",
843 "clru",
894− "dashmap",
895 "gix-chunk",
844 "gix-chunk",
896 "gix-diff",
845 "gix-diff",
897 "gix-features",
846 "gix-features",
@@ -902,7 +851,7 @@ dependencies = [
902 "gix-tempfile",
851 "gix-tempfile",
903 "gix-traverse",
852 "gix-traverse",
904 "memmap2",
853 "memmap2",
905− "parking_lot 0.12.1",
854+ "parking_lot",
906 "smallvec",
855 "smallvec",
907 "thiserror",
856 "thiserror",
908]
857]
@@ -926,26 +875,26 @@ dependencies = [
926 "gix-command",
875 "gix-command",
927 "gix-config-value",
876 "gix-config-value",
928 "nix",
877 "nix",
929− "parking_lot 0.12.1",
878+ "parking_lot",
930 "thiserror",
879 "thiserror",
931]
880]
932
881
933[[package]]
882[[package]]
934name = "gix-quote"
883name = "gix-quote"
935−version = "0.4.2"
884+version = "0.4.3"
936source = "registry+https://github.com/rust-lang/crates.io-index"
885source = "registry+https://github.com/rust-lang/crates.io-index"
937−checksum = "e34cffcf5dd0ddf06a768b697a0f29319284deffba970e4355b51b0fee61ffa2"
886+checksum = "a282f5a8d9ee0b09ec47390ac727350c48f2f5c76d803cd8da6b3e7ad56e0bcb"
938dependencies = [
887dependencies = [
939 "bstr 1.3.0",
888 "bstr 1.3.0",
940 "btoi",
889 "btoi",
941− "quick-error",
890+ "thiserror",
942]
891]
943
892
944[[package]]
893[[package]]
945name = "gix-ref"
894name = "gix-ref"
946−version = "0.24.1"
895+version = "0.26.0"
947source = "registry+https://github.com/rust-lang/crates.io-index"
896source = "registry+https://github.com/rust-lang/crates.io-index"
948−checksum = "93e85abee11aa093f24da7336bf0a8ad598f15da396b28cf1270ab1091137d35"
897+checksum = "90a0ed29e581f04b904ecd0c32b11f33b8209b5a0af9c43f415249a4f2fba632"
949dependencies = [
898dependencies = [
950 "gix-actor",
899 "gix-actor",
951 "gix-features",
900 "gix-features",
@@ -962,9 +911,9 @@ dependencies = [
962
911
963[[package]]
912[[package]]
964name = "gix-refspec"
913name = "gix-refspec"
965−version = "0.7.3"
914+version = "0.9.0"
966source = "registry+https://github.com/rust-lang/crates.io-index"
915source = "registry+https://github.com/rust-lang/crates.io-index"
967−checksum = "ac80b201eeeb3bc554583fd0127cb6bc9e20981cabb085149c9740329f8a2319"
916+checksum = "aba332462bda2e8efeae4302b39a6ed01ad56ef772fd5b7ef197cf2798294d65"
968dependencies = [
917dependencies = [
969 "bstr 1.3.0",
918 "bstr 1.3.0",
970 "gix-hash",
919 "gix-hash",
@@ -976,9 +925,9 @@ dependencies = [
976
925
977[[package]]
926[[package]]
978name = "gix-revision"
927name = "gix-revision"
979−version = "0.10.4"
928+version = "0.12.0"
980source = "registry+https://github.com/rust-lang/crates.io-index"
929source = "registry+https://github.com/rust-lang/crates.io-index"
981−checksum = "107a10d92379a797bea0f1d0eceded58e08913e0a706c8d436592673c6c6503f"
930+checksum = "ed98e4a0254953c64bc913bd23146a1de662067d5cf974cbdde396958b39e5b0"
982dependencies = [
931dependencies = [
983 "bstr 1.3.0",
932 "bstr 1.3.0",
984 "gix-date",
933 "gix-date",
@@ -1003,13 +952,13 @@ dependencies = [
1003
952
1004[[package]]
953[[package]]
1005name = "gix-tempfile"
954name = "gix-tempfile"
1006−version = "3.0.2"
955+version = "4.1.0"
1007source = "registry+https://github.com/rust-lang/crates.io-index"
956source = "registry+https://github.com/rust-lang/crates.io-index"
1008−checksum = "48590cb5de0b8feadee42466a90028877ba67b9fd894c5493b4b64f5e3217c17"
957+checksum = "a8e0227bd284cd16105e8479602bb8af6bddcb800427e881c1feee4806310a31"
1009dependencies = [
958dependencies = [
1010− "dashmap",
1011 "libc",
959 "libc",
1012 "once_cell",
960 "once_cell",
961+ "parking_lot",
1013 "signal-hook",
962 "signal-hook",
1014 "signal-hook-registry",
963 "signal-hook-registry",
1015 "tempfile",
964 "tempfile",
@@ -1017,9 +966,9 @@ dependencies = [
1017
966
1018[[package]]
967[[package]]
1019name = "gix-traverse"
968name = "gix-traverse"
1020−version = "0.22.1"
969+version = "0.24.0"
1021source = "registry+https://github.com/rust-lang/crates.io-index"
970source = "registry+https://github.com/rust-lang/crates.io-index"
1022−checksum = "f7ee7eee98b6e196fba1f34751d4399e0daa4e61892a78f634d0901e52dd739b"
971+checksum = "dd9a4a07bb22168dc79c60e1a6a41919d198187ca83d8a5940ad8d7122a45df3"
1023dependencies = [
972dependencies = [
1024 "gix-hash",
973 "gix-hash",
1025 "gix-hashtable",
974 "gix-hashtable",
@@ -1029,9 +978,9 @@ dependencies = [
1029
978
1030[[package]]
979[[package]]
1031name = "gix-url"
980name = "gix-url"
1032−version = "0.13.3"
981+version = "0.15.0"
1033source = "registry+https://github.com/rust-lang/crates.io-index"
982source = "registry+https://github.com/rust-lang/crates.io-index"
1034−checksum = "4d6e3e05267f7873099b3e510ab8eebdfc28920a915ab2e3d549493abe0fd9f0"
983+checksum = "044072b7ce8601b62dcec841b92129f5cc677072823324121b395d766ac5f528"
1035dependencies = [
984dependencies = [
1036 "bstr 1.3.0",
985 "bstr 1.3.0",
1037 "gix-features",
986 "gix-features",
@@ -1053,9 +1002,9 @@ dependencies = [
1053
1002
1054[[package]]
1003[[package]]
1055name = "gix-worktree"
1004name = "gix-worktree"
1056−version = "0.12.3"
1005+version = "0.14.0"
1057source = "registry+https://github.com/rust-lang/crates.io-index"
1006source = "registry+https://github.com/rust-lang/crates.io-index"
1058−checksum = "da7ddd5b042c85cfe768d5ea97bb204cf1ed2b9413148f482146f4e831ca172e"
1007+checksum = "b7cb9af6e56152953d8fe113c4f9d7cf60cf7a982362711e9200a255579b49cb"
1059dependencies = [
1008dependencies = [
1060 "bstr 1.3.0",
1009 "bstr 1.3.0",
1061 "gix-attributes",
1010 "gix-attributes",
@@ -1280,7 +1229,7 @@ dependencies = [
1280 "helix-core",
1229 "helix-core",
1281 "imara-diff",
1230 "imara-diff",
1282 "log",
1231 "log",
1283− "parking_lot 0.12.1",
1232+ "parking_lot",
1284 "tempfile",
1233 "tempfile",
1285 "tokio",
1234 "tokio",
1286]
1235]
@@ -1339,12 +1288,6 @@ dependencies = [
1339 "winapi",
1288 "winapi",
1340]
1289]
1341
1290
1342−[[package]]
1343−name = "human_format"
1344−version = "1.0.3"
1345−source = "registry+https://github.com/rust-lang/crates.io-index"
1346−checksum = "86cce260d758a9aa3d7c4b99d55c815a540f8a37514ba6046ab6be402a157cb0"
1347−
1348[[package]]
1291[[package]]
1349name = "iana-time-zone"
1292name = "iana-time-zone"
1350version = "0.1.53"
1293version = "0.1.53"
@@ -1653,17 +1596,6 @@ version = "1.17.1"
1653source = "registry+https://github.com/rust-lang/crates.io-index"
1596source = "registry+https://github.com/rust-lang/crates.io-index"
1654checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
1597checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
1655
1598
1656−[[package]]
1657−name = "parking_lot"
1658−version = "0.11.2"
1659−source = "registry+https://github.com/rust-lang/crates.io-index"
1660−checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
1661−dependencies = [
1662− "instant",
1663− "lock_api",
1664− "parking_lot_core 0.8.6",
1665−]
1666−
1667[[package]]
1599[[package]]
1668name = "parking_lot"
1600name = "parking_lot"
1669version = "0.12.1"
1601version = "0.12.1"
@@ -1671,21 +1603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1671checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
1603checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
1672dependencies = [
1604dependencies = [
1673 "lock_api",
1605 "lock_api",
1674− "parking_lot_core 0.9.4",
1606+ "parking_lot_core",
1675−]
1676−
1677−[[package]]
1678−name = "parking_lot_core"
1679−version = "0.8.6"
1680−source = "registry+https://github.com/rust-lang/crates.io-index"
1681−checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
1682−dependencies = [
1683− "cfg-if",
1684− "instant",
1685− "libc",
1686− "redox_syscall",
1687− "smallvec",
1688− "winapi",
1689]
1607]
1690
1608
1691[[package]]
1609[[package]]
@@ -1730,15 +1648,9 @@ dependencies = [
1730
1648
1731[[package]]
1649[[package]]
1732name = "prodash"
1650name = "prodash"
1733−version = "23.0.0"
1651+version = "23.1.1"
1734source = "registry+https://github.com/rust-lang/crates.io-index"
1652source = "registry+https://github.com/rust-lang/crates.io-index"
1735−checksum = "5d8c414345b4a98cbcd0e8d8829c8f54b47a7ed4fb771c45b7c5c6c0ae23dc4c"
1653+checksum = "d73c6b64cb5b99eb63ca97d378685712617ec0172ff5c04cd47a489d3e2c51f8"
1736−dependencies = [
1737− "bytesize",
1738− "dashmap",
1739− "human_format",
1740− "parking_lot 0.11.2",
1741−]
1742
1654
1743[[package]]
1655[[package]]
1744name = "pulldown-cmark"
1656name = "pulldown-cmark"
@@ -1751,12 +1663,6 @@ dependencies = [
1751 "unicase",
1663 "unicase",
1752]
1664]
1753
1665
1754−[[package]]
1755−name = "quick-error"
1756−version = "2.0.1"
1757−source = "registry+https://github.com/rust-lang/crates.io-index"
1758−checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
1759−
1760[[package]]
1666[[package]]
1761name = "quickcheck"
1667name = "quickcheck"
1762version = "1.0.3"
1668version = "1.0.3"
@@ -1860,12 +1766,6 @@ dependencies = [
1860 "windows-sys",
1766 "windows-sys",
1861]
1767]
1862
1768
1863−[[package]]
1864−name = "rustversion"
1865−version = "1.0.9"
1866−source = "registry+https://github.com/rust-lang/crates.io-index"
1867−checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
1868−
1869[[package]]
1769[[package]]
1870name = "ryu"
1770name = "ryu"
1871version = "1.0.11"
1771version = "1.0.11"
@@ -2208,7 +2108,7 @@ dependencies = [
2208 "memchr",
2108 "memchr",
2209 "mio",
2109 "mio",
2210 "num_cpus",
2110 "num_cpus",
2211− "parking_lot 0.12.1",
2111+ "parking_lot",
2212 "pin-project-lite",
2112 "pin-project-lite",
2213 "signal-hook-registry",
2113 "signal-hook-registry",
2214 "socket2",
2114 "socket2",
helix-term/Cargo.toml+1−1
@@ -10,7 +10,7 @@ repository = "https://github.com/helix-editor/helix"
10homepage = "https://helix-editor.com"
10homepage = "https://helix-editor.com"
11include = ["src/**/*", "README.md"]
11include = ["src/**/*", "README.md"]
12default-run = "hx"
12default-run = "hx"
13−rust-version = "1.57"
13+rust-version = "1.65"
14
14
15[features]
15[features]
16default = ["git"]
16default = ["git"]
helix-term/src/commands.rs+1−4
@@ -3061,10 +3061,7 @@ fn goto_next_change_impl(cx: &mut Context, direction: Direction) {
3061 .prev_hunk(cursor_line)
3061 .prev_hunk(cursor_line)
3062 .map(|idx| idx.saturating_sub(count)),
3062 .map(|idx| idx.saturating_sub(count)),
3063 };
3063 };
3064− // TODO refactor with let..else once MSRV reaches 1.65
3065− let hunk_idx = if let Some(hunk_idx) = hunk_idx {
3064+ let Some(hunk_idx) = hunk_idx else {
3066− hunk_idx
3067− } else {
3068 return range;
3065 return range;
3069 };
3066 };
3070 let hunk = hunks.nth_hunk(hunk_idx);
3067 let hunk = hunks.nth_hunk(hunk_idx);
helix-term/src/ui/document.rs+2−11
@@ -202,10 +202,7 @@ pub fn render_text<'t>(
202 // formattter.line_pos returns to line index of the next grapheme
202 // formattter.line_pos returns to line index of the next grapheme
203 // so it must be called before formatter.next
203 // so it must be called before formatter.next
204 let doc_line = formatter.line_pos();
204 let doc_line = formatter.line_pos();
205− // TODO refactor with let .. else once MSRV reaches 1.65
206− let (grapheme, mut pos) = if let Some(it) = formatter.next() {
205+ let Some((grapheme, mut pos)) = formatter.next() else {
207− it
208− } else {
209 let mut last_pos = formatter.visual_pos();
206 let mut last_pos = formatter.visual_pos();
210 if last_pos.row >= row_off {
207 if last_pos.row >= row_off {
211 last_pos.col -= 1;
208 last_pos.col -= 1;
@@ -226,7 +223,6 @@ pub fn render_text<'t>(
226 // skip any graphemes on visual lines before the block start
223 // skip any graphemes on visual lines before the block start
227 if pos.row < row_off {
224 if pos.row < row_off {
228 if char_pos >= style_span.1 {
225 if char_pos >= style_span.1 {
229− // TODO refactor using let..else once MSRV reaches 1.65
230 style_span = if let Some(style_span) = styles.next() {
226 style_span = if let Some(style_span) = styles.next() {
231 style_span
227 style_span
232 } else {
228 } else {
@@ -266,12 +262,7 @@ pub fn render_text<'t>(
266
262
267 // aquire the correct grapheme style
263 // aquire the correct grapheme style
268 if char_pos >= style_span.1 {
264 if char_pos >= style_span.1 {
269− // TODO refactor using let..else once MSRV reaches 1.65
270− style_span = if let Some(style_span) = styles.next() {
271− style_span
272− } else {
273− (Style::default(), usize::MAX)
265+ style_span = styles.next().unwrap_or((Style::default(), usize::MAX));
274− }
275 }
266 }
276 char_pos += grapheme.doc_chars();
267 char_pos += grapheme.doc_chars();
277
268
helix-vcs/Cargo.toml+1−1
@@ -16,7 +16,7 @@ helix-core = { version = "0.6", path = "../helix-core" }
16tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
16tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
17parking_lot = "0.12"
17parking_lot = "0.12"
18
18
19−gix = { version = "0.36.1", default-features = false , optional = true }
19+gix = { version = "0.39.0", default-features = false , optional = true }
20imara-diff = "0.1.5"
20imara-diff = "0.1.5"
21
21
22log = "0.4"
22log = "0.4"
rust-toolchain.toml+1−1
@@ -1,3 +1,3 @@
1[toolchain]
1[toolchain]
2−channel = "1.64.0"
2+channel = "1.65.0"
3components = ["rustfmt", "rust-src"]
3components = ["rustfmt", "rust-src"]