git.iko.soy/bat
on master help sign in
Update dependencies; replace unmaintained (#1522)
573f34dCaden Haustein
Cargo.lock+124−157
compare with master
unifiedsplit
@@ -17,9 +17,9 @@ dependencies = [
17
17
18[[package]]
18[[package]]
19name = "ansi_colours"
19name = "ansi_colours"
20−version = "1.0.1"
20+version = "1.0.2"
21source = "registry+https://github.com/rust-lang/crates.io-index"
21source = "registry+https://github.com/rust-lang/crates.io-index"
22−checksum = "1d0f302a81afc6a7f4350c04f0ba7cfab529cc009bca3324b3fb5764e6add8b6"
22+checksum = "52cb663b84aea8670b4a40368360e29485c11b03d14ff6283261aeccd69d5ce1"
23dependencies = [
23dependencies = [
24 "cc",
24 "cc",
25]
25]
@@ -42,24 +42,13 @@ dependencies = [
42 "winapi",
42 "winapi",
43]
43]
44
44
45−[[package]]
46−name = "arrayref"
47−version = "0.3.6"
48−source = "registry+https://github.com/rust-lang/crates.io-index"
49−checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
50−
51−[[package]]
52−name = "arrayvec"
53−version = "0.5.2"
54−source = "registry+https://github.com/rust-lang/crates.io-index"
55−checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
56−
57[[package]]
45[[package]]
58name = "assert_cmd"
46name = "assert_cmd"
59−version = "1.0.2"
47+version = "1.0.3"
60source = "registry+https://github.com/rust-lang/crates.io-index"
48source = "registry+https://github.com/rust-lang/crates.io-index"
61−checksum = "3dc1679af9a1ab4bea16f228b05d18f8363f8327b1fa8db00d2760cfafc6b61e"
49+checksum = "f2475b58cd94eb4f70159f4fd8844ba3b807532fe3131b3373fae060bbe30396"
62dependencies = [
50dependencies = [
51+ "bstr",
63 "doc-comment",
52 "doc-comment",
64 "predicates",
53 "predicates",
65 "predicates-core",
54 "predicates-core",
@@ -103,7 +92,7 @@ dependencies = [
103 "clircle",
92 "clircle",
104 "console",
93 "console",
105 "content_inspector",
94 "content_inspector",
106− "dirs",
95+ "dirs-next",
107 "encoding",
96 "encoding",
108 "error-chain",
97 "error-chain",
109 "git2",
98 "git2",
@@ -117,7 +106,7 @@ dependencies = [
117 "serial_test",
106 "serial_test",
118 "shell-words",
107 "shell-words",
119 "syntect",
108 "syntect",
120− "tempdir",
109+ "tempfile",
121 "unicode-width",
110 "unicode-width",
122 "wait-timeout",
111 "wait-timeout",
123 "wild",
112 "wild",
@@ -154,24 +143,15 @@ version = "1.2.1"
154source = "registry+https://github.com/rust-lang/crates.io-index"
143source = "registry+https://github.com/rust-lang/crates.io-index"
155checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
144checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
156
145
157−[[package]]
158−name = "blake2b_simd"
159−version = "0.5.11"
160−source = "registry+https://github.com/rust-lang/crates.io-index"
161−checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587"
162−dependencies = [
163− "arrayref",
164− "arrayvec",
165− "constant_time_eq",
166−]
167−
168[[package]]
146[[package]]
169name = "bstr"
147name = "bstr"
170−version = "0.2.14"
148+version = "0.2.15"
171source = "registry+https://github.com/rust-lang/crates.io-index"
149source = "registry+https://github.com/rust-lang/crates.io-index"
172−checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf"
150+checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
173dependencies = [
151dependencies = [
152+ "lazy_static",
174 "memchr",
153 "memchr",
154+ "regex-automata",
175]
155]
176
156
177[[package]]
157[[package]]
@@ -199,12 +179,6 @@ dependencies = [
199 "jobserver",
179 "jobserver",
200]
180]
201
181
202−[[package]]
203−name = "cfg-if"
204−version = "0.1.10"
205−source = "registry+https://github.com/rust-lang/crates.io-index"
206−checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
207−
208[[package]]
182[[package]]
209name = "cfg-if"
183name = "cfg-if"
210version = "1.0.0"
184version = "1.0.0"
@@ -243,7 +217,7 @@ version = "0.2.0"
243source = "registry+https://github.com/rust-lang/crates.io-index"
217source = "registry+https://github.com/rust-lang/crates.io-index"
244checksum = "e27a01e782190a8314e65cc94274d9bbcd52e05a9d15b437fe2b31259b854b0d"
218checksum = "e27a01e782190a8314e65cc94274d9bbcd52e05a9d15b437fe2b31259b854b0d"
245dependencies = [
219dependencies = [
246− "cfg-if 1.0.0",
220+ "cfg-if",
247 "nix",
221 "nix",
248 "serde",
222 "serde",
249 "winapi",
223 "winapi",
@@ -264,12 +238,6 @@ dependencies = [
264 "winapi",
238 "winapi",
265]
239]
266
240
267−[[package]]
268−name = "constant_time_eq"
269−version = "0.1.5"
270−source = "registry+https://github.com/rust-lang/crates.io-index"
271−checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
272−
273[[package]]
241[[package]]
274name = "content_inspector"
242name = "content_inspector"
275version = "0.2.4"
243version = "0.2.4"
@@ -285,18 +253,7 @@ version = "1.2.1"
285source = "registry+https://github.com/rust-lang/crates.io-index"
253source = "registry+https://github.com/rust-lang/crates.io-index"
286checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
254checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
287dependencies = [
255dependencies = [
288− "cfg-if 1.0.0",
256+ "cfg-if",
289−]
290−
291−[[package]]
292−name = "crossbeam-utils"
293−version = "0.8.1"
294−source = "registry+https://github.com/rust-lang/crates.io-index"
295−checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
296−dependencies = [
297− "autocfg",
298− "cfg-if 1.0.0",
299− "lazy_static",
300]
257]
301
258
302[[package]]
259[[package]]
@@ -306,19 +263,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
306checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
263checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
307
264
308[[package]]
265[[package]]
309−name = "dirs"
266+name = "dirs-next"
310−version = "3.0.1"
267+version = "2.0.0"
311source = "registry+https://github.com/rust-lang/crates.io-index"
268source = "registry+https://github.com/rust-lang/crates.io-index"
312−checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff"
269+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
313dependencies = [
270dependencies = [
271+ "cfg-if",
314− "dirs-sys",
272+ "dirs-sys-next",
315]
273]
316
274
317[[package]]
275[[package]]
318−name = "dirs-sys"
276+name = "dirs-sys-next"
319−version = "0.3.5"
277+version = "0.1.2"
320source = "registry+https://github.com/rust-lang/crates.io-index"
278source = "registry+https://github.com/rust-lang/crates.io-index"
321−checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a"
279+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
322dependencies = [
280dependencies = [
323 "libc",
281 "libc",
324 "redox_users",
282 "redox_users",
@@ -428,11 +386,11 @@ dependencies = [
428
386
429[[package]]
387[[package]]
430name = "flate2"
388name = "flate2"
431−version = "1.0.19"
389+version = "1.0.20"
432source = "registry+https://github.com/rust-lang/crates.io-index"
390source = "registry+https://github.com/rust-lang/crates.io-index"
433−checksum = "7411863d55df97a419aa64cb4d2f167103ea9d767e2c54a1868b7ac3f6b47129"
391+checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
434dependencies = [
392dependencies = [
435− "cfg-if 1.0.0",
393+ "cfg-if",
436 "crc32fast",
394 "crc32fast",
437 "libc",
395 "libc",
438 "miniz_oxide",
396 "miniz_oxide",
@@ -463,19 +421,13 @@ dependencies = [
463 "percent-encoding",
421 "percent-encoding",
464]
422]
465
423
466−[[package]]
467−name = "fuchsia-cprng"
468−version = "0.1.1"
469−source = "registry+https://github.com/rust-lang/crates.io-index"
470−checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
471−
472[[package]]
424[[package]]
473name = "getrandom"
425name = "getrandom"
474−version = "0.1.16"
426+version = "0.2.2"
475source = "registry+https://github.com/rust-lang/crates.io-index"
427source = "registry+https://github.com/rust-lang/crates.io-index"
476−checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
428+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
477dependencies = [
429dependencies = [
478− "cfg-if 1.0.0",
430+ "cfg-if",
479 "libc",
431 "libc",
480 "wasi",
432 "wasi",
481]
433]
@@ -514,27 +466,24 @@ dependencies = [
514
466
515[[package]]
467[[package]]
516name = "hashbrown"
468name = "hashbrown"
517−version = "0.8.2"
469+version = "0.9.1"
518source = "registry+https://github.com/rust-lang/crates.io-index"
470source = "registry+https://github.com/rust-lang/crates.io-index"
519−checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
471+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
520−dependencies = [
521− "autocfg",
522−]
523
472
524[[package]]
473[[package]]
525name = "hermit-abi"
474name = "hermit-abi"
526−version = "0.1.17"
475+version = "0.1.18"
527source = "registry+https://github.com/rust-lang/crates.io-index"
476source = "registry+https://github.com/rust-lang/crates.io-index"
528−checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
477+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
529dependencies = [
478dependencies = [
530 "libc",
479 "libc",
531]
480]
532
481
533[[package]]
482[[package]]
534name = "idna"
483name = "idna"
535−version = "0.2.0"
484+version = "0.2.1"
536source = "registry+https://github.com/rust-lang/crates.io-index"
485source = "registry+https://github.com/rust-lang/crates.io-index"
537−checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9"
486+checksum = "de910d521f7cc3135c4de8db1cb910e0b5ed1dc6f57c381cd07e8e661ce10094"
538dependencies = [
487dependencies = [
539 "matches",
488 "matches",
540 "unicode-bidi",
489 "unicode-bidi",
@@ -543,9 +492,9 @@ dependencies = [
543
492
544[[package]]
493[[package]]
545name = "indexmap"
494name = "indexmap"
546−version = "1.5.2"
495+version = "1.6.1"
547source = "registry+https://github.com/rust-lang/crates.io-index"
496source = "registry+https://github.com/rust-lang/crates.io-index"
548−checksum = "4e47a3566dd4fd4eec714ae6ceabdee0caec795be835c223d92c2d40f1e8cf1c"
497+checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b"
549dependencies = [
498dependencies = [
550 "autocfg",
499 "autocfg",
551 "hashbrown",
500 "hashbrown",
@@ -557,7 +506,7 @@ version = "0.1.9"
557source = "registry+https://github.com/rust-lang/crates.io-index"
506source = "registry+https://github.com/rust-lang/crates.io-index"
558checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
507checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
559dependencies = [
508dependencies = [
560− "cfg-if 1.0.0",
509+ "cfg-if",
561]
510]
562
511
563[[package]]
512[[package]]
@@ -589,15 +538,15 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
589
538
590[[package]]
539[[package]]
591name = "libc"
540name = "libc"
592−version = "0.2.82"
541+version = "0.2.86"
593source = "registry+https://github.com/rust-lang/crates.io-index"
542source = "registry+https://github.com/rust-lang/crates.io-index"
594−checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
543+checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
595
544
596[[package]]
545[[package]]
597name = "libgit2-sys"
546name = "libgit2-sys"
598−version = "0.12.17+1.1.0"
547+version = "0.12.18+1.1.0"
599source = "registry+https://github.com/rust-lang/crates.io-index"
548source = "registry+https://github.com/rust-lang/crates.io-index"
600−checksum = "f4ebdf65ca745126df8824688637aa0535a88900b83362d8ca63893bcf4e8841"
549+checksum = "3da6a42da88fc37ee1ecda212ffa254c25713532980005d5f7c0b0fbe7e6e885"
601dependencies = [
550dependencies = [
602 "cc",
551 "cc",
603 "libc",
552 "libc",
@@ -643,11 +592,11 @@ dependencies = [
643
592
644[[package]]
593[[package]]
645name = "log"
594name = "log"
646−version = "0.4.11"
595+version = "0.4.14"
647source = "registry+https://github.com/rust-lang/crates.io-index"
596source = "registry+https://github.com/rust-lang/crates.io-index"
648−checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
597+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
649dependencies = [
598dependencies = [
650− "cfg-if 0.1.10",
599+ "cfg-if",
651]
600]
652
601
653[[package]]
602[[package]]
@@ -680,7 +629,7 @@ checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
680dependencies = [
629dependencies = [
681 "bitflags",
630 "bitflags",
682 "cc",
631 "cc",
683− "cfg-if 1.0.0",
632+ "cfg-if",
684 "libc",
633 "libc",
685]
634]
686
635
@@ -709,6 +658,12 @@ dependencies = [
709 "autocfg",
658 "autocfg",
710]
659]
711
660
661+[[package]]
662+name = "once_cell"
663+version = "1.5.2"
664+source = "registry+https://github.com/rust-lang/crates.io-index"
665+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
666+
712[[package]]
667[[package]]
713name = "onig"
668name = "onig"
714version = "6.1.1"
669version = "6.1.1"
@@ -744,11 +699,11 @@ dependencies = [
744
699
745[[package]]
700[[package]]
746name = "parking_lot_core"
701name = "parking_lot_core"
747−version = "0.8.2"
702+version = "0.8.3"
748source = "registry+https://github.com/rust-lang/crates.io-index"
703source = "registry+https://github.com/rust-lang/crates.io-index"
749−checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272"
704+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
750dependencies = [
705dependencies = [
751− "cfg-if 1.0.0",
706+ "cfg-if",
752 "instant",
707 "instant",
753 "libc",
708 "libc",
754 "redox_syscall",
709 "redox_syscall",
@@ -788,9 +743,9 @@ checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
788
743
789[[package]]
744[[package]]
790name = "plist"
745name = "plist"
791−version = "1.0.1"
746+version = "1.1.0"
792source = "registry+https://github.com/rust-lang/crates.io-index"
747source = "registry+https://github.com/rust-lang/crates.io-index"
793−checksum = "4dc57ccf442c7414b790e8e7b72fb4d776a66c7680129360946d9aaa6f5311e9"
748+checksum = "679104537029ed2287c216bfb942bbf723f48ee98f0aef15611634173a74ef21"
794dependencies = [
749dependencies = [
795 "base64",
750 "base64",
796 "chrono",
751 "chrono",
@@ -800,6 +755,12 @@ dependencies = [
800 "xml-rs",
755 "xml-rs",
801]
756]
802
757
758+[[package]]
759+name = "ppv-lite86"
760+version = "0.2.10"
761+source = "registry+https://github.com/rust-lang/crates.io-index"
762+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
763+
803[[package]]
764[[package]]
804name = "predicates"
765name = "predicates"
805version = "1.0.7"
766version = "1.0.7"
@@ -815,15 +776,15 @@ dependencies = [
815
776
816[[package]]
777[[package]]
817name = "predicates-core"
778name = "predicates-core"
818−version = "1.0.1"
779+version = "1.0.2"
819source = "registry+https://github.com/rust-lang/crates.io-index"
780source = "registry+https://github.com/rust-lang/crates.io-index"
820−checksum = "fb3dbeaaf793584e29c58c7e3a82bbb3c7c06b63cea68d13b0e3cddc124104dc"
781+checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451"
821
782
822[[package]]
783[[package]]
823name = "predicates-tree"
784name = "predicates-tree"
824−version = "1.0.1"
785+version = "1.0.2"
825source = "registry+https://github.com/rust-lang/crates.io-index"
786source = "registry+https://github.com/rust-lang/crates.io-index"
826−checksum = "aee95d988ee893cb35c06b148c80ed2cd52c8eea927f50ba7a0be1a786aeab73"
787+checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2"
827dependencies = [
788dependencies = [
828 "predicates-core",
789 "predicates-core",
829 "treeline",
790 "treeline",
@@ -840,65 +801,70 @@ dependencies = [
840
801
841[[package]]
802[[package]]
842name = "quote"
803name = "quote"
843−version = "1.0.8"
804+version = "1.0.9"
844source = "registry+https://github.com/rust-lang/crates.io-index"
805source = "registry+https://github.com/rust-lang/crates.io-index"
845−checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
806+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
846dependencies = [
807dependencies = [
847 "proc-macro2",
808 "proc-macro2",
848]
809]
849
810
850[[package]]
811[[package]]
851name = "rand"
812name = "rand"
852−version = "0.4.6"
813+version = "0.8.3"
853source = "registry+https://github.com/rust-lang/crates.io-index"
814source = "registry+https://github.com/rust-lang/crates.io-index"
854−checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
815+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
855dependencies = [
816dependencies = [
856− "fuchsia-cprng",
857 "libc",
817 "libc",
818+ "rand_chacha",
858− "rand_core 0.3.1",
819+ "rand_core",
859− "rdrand",
820+ "rand_hc",
860− "winapi",
861]
821]
862
822
863[[package]]
823[[package]]
864−name = "rand_core"
824+name = "rand_chacha"
865−version = "0.3.1"
825+version = "0.3.0"
866source = "registry+https://github.com/rust-lang/crates.io-index"
826source = "registry+https://github.com/rust-lang/crates.io-index"
867−checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
827+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
868dependencies = [
828dependencies = [
829+ "ppv-lite86",
869− "rand_core 0.4.2",
830+ "rand_core",
870]
831]
871
832
872[[package]]
833[[package]]
873name = "rand_core"
834name = "rand_core"
874−version = "0.4.2"
835+version = "0.6.2"
875source = "registry+https://github.com/rust-lang/crates.io-index"
836source = "registry+https://github.com/rust-lang/crates.io-index"
876−checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
837+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
838+dependencies = [
839+ "getrandom",
840+]
877
841
878[[package]]
842[[package]]
879−name = "rdrand"
843+name = "rand_hc"
880−version = "0.4.0"
844+version = "0.3.0"
881source = "registry+https://github.com/rust-lang/crates.io-index"
845source = "registry+https://github.com/rust-lang/crates.io-index"
882−checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
846+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
883dependencies = [
847dependencies = [
884− "rand_core 0.3.1",
848+ "rand_core",
885]
849]
886
850
887[[package]]
851[[package]]
888name = "redox_syscall"
852name = "redox_syscall"
889−version = "0.1.57"
853+version = "0.2.5"
890source = "registry+https://github.com/rust-lang/crates.io-index"
854source = "registry+https://github.com/rust-lang/crates.io-index"
891−checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
855+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
856+dependencies = [
857+ "bitflags",
858+]
892
859
893[[package]]
860[[package]]
894name = "redox_users"
861name = "redox_users"
895−version = "0.3.5"
862+version = "0.4.0"
896source = "registry+https://github.com/rust-lang/crates.io-index"
863source = "registry+https://github.com/rust-lang/crates.io-index"
897−checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d"
864+checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64"
898dependencies = [
865dependencies = [
899 "getrandom",
866 "getrandom",
900 "redox_syscall",
867 "redox_syscall",
901− "rust-argon2",
902]
868]
903
869
904[[package]]
870[[package]]
@@ -913,6 +879,15 @@ dependencies = [
913 "thread_local",
879 "thread_local",
914]
880]
915
881
882+[[package]]
883+name = "regex-automata"
884+version = "0.1.9"
885+source = "registry+https://github.com/rust-lang/crates.io-index"
886+checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4"
887+dependencies = [
888+ "byteorder",
889+]
890+
916[[package]]
891[[package]]
917name = "regex-syntax"
892name = "regex-syntax"
918version = "0.6.22"
893version = "0.6.22"
@@ -928,18 +903,6 @@ dependencies = [
928 "winapi",
903 "winapi",
929]
904]
930
905
931−[[package]]
932−name = "rust-argon2"
933−version = "0.8.3"
934−source = "registry+https://github.com/rust-lang/crates.io-index"
935−checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb"
936−dependencies = [
937− "base64",
938− "blake2b_simd",
939− "constant_time_eq",
940− "crossbeam-utils",
941−]
942−
943[[package]]
906[[package]]
944name = "ryu"
907name = "ryu"
945version = "1.0.5"
908version = "1.0.5"
@@ -1007,9 +970,9 @@ dependencies = [
1007
970
1008[[package]]
971[[package]]
1009name = "serde_json"
972name = "serde_json"
1010−version = "1.0.61"
973+version = "1.0.62"
1011source = "registry+https://github.com/rust-lang/crates.io-index"
974source = "registry+https://github.com/rust-lang/crates.io-index"
1012−checksum = "4fceb2595057b6891a4ee808f70054bd2d12f0e97f1cbb78689b59f676df325a"
975+checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486"
1013dependencies = [
976dependencies = [
1014 "itoa",
977 "itoa",
1015 "ryu",
978 "ryu",
@@ -1018,9 +981,9 @@ dependencies = [
1018
981
1019[[package]]
982[[package]]
1020name = "serde_yaml"
983name = "serde_yaml"
1021−version = "0.8.15"
984+version = "0.8.17"
1022source = "registry+https://github.com/rust-lang/crates.io-index"
985source = "registry+https://github.com/rust-lang/crates.io-index"
1023−checksum = "971be8f6e4d4a47163b405a3df70d14359186f9ab0f3a3ec37df144ca1ce089f"
986+checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23"
1024dependencies = [
987dependencies = [
1025 "dtoa",
988 "dtoa",
1026 "linked-hash-map",
989 "linked-hash-map",
@@ -1129,13 +1092,17 @@ dependencies = [
1129]
1092]
1130
1093
1131[[package]]
1094[[package]]
1132−name = "tempdir"
1095+name = "tempfile"
1133−version = "0.3.7"
1096+version = "3.2.0"
1134source = "registry+https://github.com/rust-lang/crates.io-index"
1097source = "registry+https://github.com/rust-lang/crates.io-index"
1135−checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
1098+checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
1136dependencies = [
1099dependencies = [
1100+ "cfg-if",
1101+ "libc",
1137 "rand",
1102 "rand",
1103+ "redox_syscall",
1138 "remove_dir_all",
1104 "remove_dir_all",
1105+ "winapi",
1139]
1106]
1140
1107
1141[[package]]
1108[[package]]
@@ -1150,9 +1117,9 @@ dependencies = [
1150
1117
1151[[package]]
1118[[package]]
1152name = "terminal_size"
1119name = "terminal_size"
1153−version = "0.1.15"
1120+version = "0.1.16"
1154source = "registry+https://github.com/rust-lang/crates.io-index"
1121source = "registry+https://github.com/rust-lang/crates.io-index"
1155−checksum = "4bd2d183bd3fac5f5fe38ddbeb4dc9aec4a39a9d7d59e7491d900302da01cbe1"
1122+checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406"
1156dependencies = [
1123dependencies = [
1157 "libc",
1124 "libc",
1158 "winapi",
1125 "winapi",
@@ -1190,18 +1157,18 @@ dependencies = [
1190
1157
1191[[package]]
1158[[package]]
1192name = "thread_local"
1159name = "thread_local"
1193−version = "1.1.0"
1160+version = "1.1.3"
1194source = "registry+https://github.com/rust-lang/crates.io-index"
1161source = "registry+https://github.com/rust-lang/crates.io-index"
1195−checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447"
1162+checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
1196dependencies = [
1163dependencies = [
1197− "lazy_static",
1164+ "once_cell",
1198]
1165]
1199
1166
1200[[package]]
1167[[package]]
1201name = "tinyvec"
1168name = "tinyvec"
1202−version = "1.1.0"
1169+version = "1.1.1"
1203source = "registry+https://github.com/rust-lang/crates.io-index"
1170source = "registry+https://github.com/rust-lang/crates.io-index"
1204−checksum = "ccf8dbc19eb42fba10e8feaaec282fb50e2c14b2726d6301dbfeed0f73306a6f"
1171+checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023"
1205dependencies = [
1172dependencies = [
1206 "tinyvec_macros",
1173 "tinyvec_macros",
1207]
1174]
@@ -1235,9 +1202,9 @@ dependencies = [
1235
1202
1236[[package]]
1203[[package]]
1237name = "unicode-normalization"
1204name = "unicode-normalization"
1238−version = "0.1.16"
1205+version = "0.1.17"
1239source = "registry+https://github.com/rust-lang/crates.io-index"
1206source = "registry+https://github.com/rust-lang/crates.io-index"
1240−checksum = "a13e63ab62dbe32aeee58d1c5408d35c36c392bba5d9d3142287219721afe606"
1207+checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef"
1241dependencies = [
1208dependencies = [
1242 "tinyvec",
1209 "tinyvec",
1243]
1210]
@@ -1312,9 +1279,9 @@ dependencies = [
1312
1279
1313[[package]]
1280[[package]]
1314name = "wasi"
1281name = "wasi"
1315−version = "0.9.0+wasi-snapshot-preview1"
1282+version = "0.10.2+wasi-snapshot-preview1"
1316source = "registry+https://github.com/rust-lang/crates.io-index"
1283source = "registry+https://github.com/rust-lang/crates.io-index"
1317−checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
1284+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
1318
1285
1319[[package]]
1286[[package]]
1320name = "wild"
1287name = "wild"
Cargo.toml+5−8
@@ -1,16 +1,13 @@
1[package]
1[package]
2authors = ["David Peter <mail@david-peter.de>"]
2authors = ["David Peter <mail@david-peter.de>"]
3categories = ["command-line-utilities"]
3categories = ["command-line-utilities"]
4−description="A cat(1) clone with wings."
4+description = "A cat(1) clone with wings."
5homepage = "https://github.com/sharkdp/bat"
5homepage = "https://github.com/sharkdp/bat"
6license = "MIT/Apache-2.0"
6license = "MIT/Apache-2.0"
7name = "bat"
7name = "bat"
8repository = "https://github.com/sharkdp/bat"
8repository = "https://github.com/sharkdp/bat"
9version = "0.17.1"
9version = "0.17.1"
10−exclude = [
11− "assets/syntaxes/*",
10+exclude = ["assets/syntaxes/*", "assets/themes/*"]
12− "assets/themes/*",
13−]
14build = "build.rs"
11build = "build.rs"
15edition = '2018'
12edition = '2018'
16
13
@@ -21,7 +18,7 @@ default = ["application"]
21application = [
18application = [
22 "atty",
19 "atty",
23 "clap",
20 "clap",
24− "dirs",
21+ "dirs-next",
25 "git",
22 "git",
26 "lazy_static",
23 "lazy_static",
27 "paging",
24 "paging",
@@ -40,7 +37,6 @@ atty = { version = "0.2.14", optional = true }
40ansi_term = "^0.12.1"
37ansi_term = "^0.12.1"
41ansi_colours = "^1.0"
38ansi_colours = "^1.0"
42console = "0.14.0"
39console = "0.14.0"
43−dirs = { version = "3.0", optional = true }
44lazy_static = { version = "1.4", optional = true }
40lazy_static = { version = "1.4", optional = true }
45wild = { version = "2.0", optional = true }
41wild = { version = "2.0", optional = true }
46content_inspector = "0.2.4"
42content_inspector = "0.2.4"
@@ -54,6 +50,7 @@ semver = "0.11"
54path_abs = { version = "0.5", default-features = false }
50path_abs = { version = "0.5", default-features = false }
55clircle = "0.2.0"
51clircle = "0.2.0"
56bugreport = "0.3"
52bugreport = "0.3"
53+dirs-next = { version = "2.0.0", optional = true }
57
54
58[dependencies.git2]
55[dependencies.git2]
59version = "0.13"
56version = "0.13"
@@ -76,11 +73,11 @@ version = "0.12"
76default-features = false
73default-features = false
77
74
78[dev-dependencies]
75[dev-dependencies]
79−tempdir = "0.3"
80assert_cmd = "1.0.2"
76assert_cmd = "1.0.2"
81serial_test = "0.5.1"
77serial_test = "0.5.1"
82predicates = "1.0.7"
78predicates = "1.0.7"
83wait-timeout = "0.2.0"
79wait-timeout = "0.2.0"
80+tempfile = "3.2.0"
84
81
85[build-dependencies]
82[build-dependencies]
86clap = { version = "2.33", optional = true }
83clap = { version = "2.33", optional = true }
src/assets.rs+2−3
@@ -297,7 +297,7 @@ mod tests {
297
297
298 use std::fs::File;
298 use std::fs::File;
299 use std::io::Write;
299 use std::io::Write;
300− use tempdir::TempDir;
300+ use tempfile::TempDir;
301
301
302 use crate::input::Input;
302 use crate::input::Input;
303
303
@@ -312,8 +312,7 @@ mod tests {
312 SyntaxDetectionTest {
312 SyntaxDetectionTest {
313 assets: HighlightingAssets::from_binary(),
313 assets: HighlightingAssets::from_binary(),
314 syntax_mapping: SyntaxMapping::builtin(),
314 syntax_mapping: SyntaxMapping::builtin(),
315− temp_dir: TempDir::new("bat_syntax_detection_tests")
316− .expect("creation of temporary directory"),
315+ temp_dir: TempDir::new().expect("creation of temporary directory"),
317 }
316 }
318 }
317 }
319
318
src/bin/bat/directories.rs+4−4
@@ -19,10 +19,10 @@ impl BatProjectDirs {
19 let config_dir_op = env::var_os("XDG_CONFIG_HOME")
19 let config_dir_op = env::var_os("XDG_CONFIG_HOME")
20 .map(PathBuf::from)
20 .map(PathBuf::from)
21 .filter(|p| p.is_absolute())
21 .filter(|p| p.is_absolute())
22− .or_else(|| dirs::home_dir().map(|d| d.join(".config")));
22+ .or_else(|| dirs_next::home_dir().map(|d| d.join(".config")));
23
23
24 #[cfg(not(target_os = "macos"))]
24 #[cfg(not(target_os = "macos"))]
25− let config_dir_op = dirs::config_dir();
25+ let config_dir_op = dirs_next::config_dir();
26
26
27 let config_dir = config_dir_op.map(|d| d.join("bat"))?;
27 let config_dir = config_dir_op.map(|d| d.join("bat"))?;
28
28
@@ -43,10 +43,10 @@ impl BatProjectDirs {
43 let cache_dir_op = env::var_os("XDG_CACHE_HOME")
43 let cache_dir_op = env::var_os("XDG_CACHE_HOME")
44 .map(PathBuf::from)
44 .map(PathBuf::from)
45 .filter(|p| p.is_absolute())
45 .filter(|p| p.is_absolute())
46− .or_else(|| dirs::home_dir().map(|d| d.join(".cache")));
46+ .or_else(|| dirs_next::home_dir().map(|d| d.join(".cache")));
47
47
48 #[cfg(not(target_os = "macos"))]
48 #[cfg(not(target_os = "macos"))]
49− let cache_dir_op = dirs::cache_dir();
49+ let cache_dir_op = dirs_next::cache_dir();
50
50
51 cache_dir_op.map(|d| d.join("bat"))
51 cache_dir_op.map(|d| d.join("bat"))
52 }
52 }
tests/integration_tests.rs+2−2
@@ -946,9 +946,9 @@ fn file_with_invalid_utf8_filename() {
946 use std::io::Write;
946 use std::io::Write;
947 use std::os::unix::ffi::OsStrExt;
947 use std::os::unix::ffi::OsStrExt;
948
948
949− use tempdir::TempDir;
949+ use tempfile::TempDir;
950
950
951− let tmp_dir = TempDir::new("bat_test").expect("can create temporary directory");
951+ let tmp_dir = TempDir::new().expect("can create temporary directory");
952 let file_path = tmp_dir
952 let file_path = tmp_dir
953 .path()
953 .path()
954 .join(OsStr::from_bytes(b"test-invalid-utf8-\xC3(.rs"));
954 .join(OsStr::from_bytes(b"test-invalid-utf8-\xC3(.rs"));
tests/tester.rs+2−2
@@ -4,7 +4,7 @@ use std::io::Read;
4use std::path::{Path, PathBuf};
4use std::path::{Path, PathBuf};
5use std::process::Command;
5use std::process::Command;
6
6
7−use tempdir::TempDir;
7+use tempfile::TempDir;
8
8
9use git2::build::CheckoutBuilder;
9use git2::build::CheckoutBuilder;
10use git2::Repository;
10use git2::Repository;
@@ -70,7 +70,7 @@ impl Default for BatTester {
70
70
71fn create_sample_directory() -> Result<TempDir, git2::Error> {
71fn create_sample_directory() -> Result<TempDir, git2::Error> {
72 // Create temp directory and initialize repository
72 // Create temp directory and initialize repository
73− let temp_dir = TempDir::new("bat-tests").expect("Temp directory");
73+ let temp_dir = TempDir::new().expect("Temp directory");
74 let repo = Repository::init(&temp_dir)?;
74 let repo = Repository::init(&temp_dir)?;
75
75
76 // Copy over `sample.rs`
76 // Copy over `sample.rs`