git.iko.soy/bat
on master help sign in
Updates for syntect 3.0
commit5842d58c017295e8d99c8712d44b7d62d1afd318 authorsharkdp <davidpeter@web.de> dateTue 9 Oct 2018, 21:18 (8 years ago) parente3c71ad
5 files changed+88−117
compare with master
unifiedsplit
Cargo.lock+42−63 Cargo.toml+1−1 assets/syntaxes.bin src/assets.rs+41−52 src/printer.rs+4−1
Cargo.lock+42−63
@@ -34,11 +34,11 @@ dependencies = [
3434
3535[[package]]
3636name = "base64"
37−version = "0.8.0"
37+version = "0.9.3"
3838source = "registry+https://github.com/rust-lang/crates.io-index"
3939dependencies = [
4040 "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
41− "safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
41+ "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
4242]
4343
4444[[package]]
@@ -56,7 +56,7 @@ dependencies = [
5656 "error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
5757 "git2 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)",
5858 "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
59− "syntect 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
59+ "syntect 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
6060 "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
6161 "wild 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
6262]
@@ -90,16 +90,6 @@ name = "cfg-if"
9090version = "0.1.5"
9191source = "registry+https://github.com/rust-lang/crates.io-index"
9292
93−[[package]]
94−name = "chrono"
95−version = "0.4.6"
96−source = "registry+https://github.com/rust-lang/crates.io-index"
97−dependencies = [
98− "num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)",
99− "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
100− "time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
101−]
102−
10393[[package]]
10494name = "clap"
10595version = "2.32.0"
@@ -274,6 +264,14 @@ name = "glob"
274264version = "0.2.11"
275265source = "registry+https://github.com/rust-lang/crates.io-index"
276266
267+[[package]]
268+name = "humantime"
269+version = "1.1.1"
270+source = "registry+https://github.com/rust-lang/crates.io-index"
271+dependencies = [
272+ "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
273+]
274+
277275[[package]]
278276name = "idna"
279277version = "0.1.5"
@@ -311,6 +309,11 @@ dependencies = [
311309 "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
312310]
313311
312+[[package]]
313+name = "lazycell"
314+version = "1.2.0"
315+source = "registry+https://github.com/rust-lang/crates.io-index"
316+
314317[[package]]
315318name = "libc"
316319version = "0.2.43"
@@ -384,33 +387,20 @@ dependencies = [
384387 "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
385388]
386389
387−[[package]]
388−name = "num-integer"
389−version = "0.1.39"
390−source = "registry+https://github.com/rust-lang/crates.io-index"
391−dependencies = [
392− "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
393−]
394−
395−[[package]]
396−name = "num-traits"
397−version = "0.2.6"
398−source = "registry+https://github.com/rust-lang/crates.io-index"
399−
400390[[package]]
401391name = "onig"
402−version = "3.2.2"
392+version = "4.2.0"
403393source = "registry+https://github.com/rust-lang/crates.io-index"
404394dependencies = [
405395 "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
406396 "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
407397 "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
408− "onig_sys 68.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
398+ "onig_sys 69.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
409399]
410400
411401[[package]]
412402name = "onig_sys"
413−version = "68.2.1"
403+version = "69.0.0"
414404source = "registry+https://github.com/rust-lang/crates.io-index"
415405dependencies = [
416406 "cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -459,12 +449,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
459449
460450[[package]]
461451name = "plist"
462−version = "0.2.4"
452+version = "0.3.0"
463453source = "registry+https://github.com/rust-lang/crates.io-index"
464454dependencies = [
465− "base64 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
455+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
466456 "byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
467− "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
457+ "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
468458 "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
469459 "xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
470460]
@@ -477,6 +467,11 @@ dependencies = [
477467 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
478468]
479469
470+[[package]]
471+name = "quick-error"
472+version = "1.2.2"
473+source = "registry+https://github.com/rust-lang/crates.io-index"
474+
480475[[package]]
481476name = "quote"
482477version = "0.6.8"
@@ -545,11 +540,6 @@ dependencies = [
545540 "utf8-ranges 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
546541]
547542
548−[[package]]
549−name = "regex-syntax"
550−version = "0.4.2"
551−source = "registry+https://github.com/rust-lang/crates.io-index"
552−
553543[[package]]
554544name = "regex-syntax"
555545version = "0.6.2"
@@ -581,7 +571,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
581571
582572[[package]]
583573name = "safemem"
584−version = "0.2.0"
574+version = "0.3.0"
585575source = "registry+https://github.com/rust-lang/crates.io-index"
586576
587577[[package]]
@@ -665,7 +655,7 @@ dependencies = [
665655
666656[[package]]
667657name = "syntect"
668−version = "2.1.0"
658+version = "3.0.0"
669659source = "registry+https://github.com/rust-lang/crates.io-index"
670660dependencies = [
671661 "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -673,9 +663,10 @@ dependencies = [
673663 "flate2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
674664 "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
675665 "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
676− "onig 3.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
677− "plist 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
678− "regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
666+ "lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
667+ "onig 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
668+ "plist 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
669+ "regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
679670 "serde 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
680671 "serde_derive 1.0.79 (registry+https://github.com/rust-lang/crates.io-index)",
681672 "serde_json 1.0.32 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -737,16 +728,6 @@ dependencies = [
737728 "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
738729]
739730
740−[[package]]
741−name = "time"
742−version = "0.1.40"
743−source = "registry+https://github.com/rust-lang/crates.io-index"
744−dependencies = [
745− "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
746− "redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)",
747− "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
748−]
749−
750731[[package]]
751732name = "ucd-util"
752733version = "0.1.1"
@@ -894,13 +875,12 @@ dependencies = [
894875"checksum ansi_colours 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0f302a81afc6a7f4350c04f0ba7cfab529cc009bca3324b3fb5764e6add8b6"
895876"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
896877"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
897−"checksum base64 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c4a342b450b268e1be8036311e2c613d7f8a7ed31214dff1cc3b60852a3168d"
878+"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
898879"checksum bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9f2fb9e29e72fd6bc12071533d5dc7664cb01480c59406f656d7ac25c7bd8ff7"
899880"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
900881"checksum byteorder 1.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "90492c5858dd7d2e78691cfb89f90d273a2800fc11d98f60786e5d87e2f83781"
901882"checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16"
902883"checksum cfg-if 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3"
903−"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
904884"checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
905885"checksum clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f84dec9bc083ce2503908cd305af98bd363da6f54bf8d4bf0ac14ee749ad5d1"
906886"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
@@ -921,11 +901,13 @@ dependencies = [
921901"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
922902"checksum git2 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "591f8be1674b421644b6c030969520bc3fa12114d2eb467471982ed3e9584e71"
923903"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
904+"checksum humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e"
924905"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
925906"checksum itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1306f3464951f30e30d12373d31c79fbd52d236e5e896fd92f96ec7babbbe60b"
926907"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
927908"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
928909"checksum lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca488b89a5657b0a2ecd45b95609b3e848cf1755da332a0da46e2b2b1cb371a7"
910+"checksum lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddba4c30a78328befecec92fc94970e53b3ae385827d28620f0f5bb2493081e0"
929911"checksum libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)" = "76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d"
930912"checksum libgit2-sys 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4916b5addc78ec36cc309acfcdf0b9f9d97ab7b84083118b248709c5b7029356"
931913"checksum libz-sys 1.0.23 (registry+https://github.com/rust-lang/crates.io-index)" = "c7bdca442aa002a930e6eb2a71916cabe46d91ffec8df66db0abfb1bc83469ab"
@@ -935,17 +917,16 @@ dependencies = [
935917"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
936918"checksum memchr 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4b3629fe9fdbff6daa6c33b90f7c08355c1aca05a3d01fa8063b822fcf185f3b"
937919"checksum miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "609ce024854aeb19a0ef7567d348aaa5a746b32fb72e336df7fcc16869d7e2b4"
938−"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
939−"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1"
940−"checksum onig 3.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f5eeb268a4620c74ea5768c6d2ccd492d60a47a8754666b91a46bfc35cd4d1ba"
941−"checksum onig_sys 68.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "195ebddbb56740be48042ca117b8fb6e0d99fe392191a9362d82f5f69e510379"
920+"checksum onig 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9f0d9dac9b8a5211103d75f3ce8d0c799e6f4f3f22608eeaefb4419786e4b258"
921+"checksum onig_sys 69.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "78c04019a39ebac42dfd8c7822af0a009043720845a812ddbb95e403298b0183"
942922"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
943923"checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"
944924"checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c"
945925"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
946926"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
947−"checksum plist 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c61ac2afed2856590ae79d6f358a24b85ece246d2aa134741a66d589519b7503"
927+"checksum plist 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c7316832d9ac5da02786bdc89a3faf0ca07070212b388766e969078fd593edc"
948928"checksum proc-macro2 0.4.20 (registry+https://github.com/rust-lang/crates.io-index)" = "3d7b7eaaa90b4a90a932a9ea6666c95a389e424eff347f0f793979289429feee"
929+"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
949930"checksum quote 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "dd636425967c33af890042c483632d33fa7a18f19ad1d7ea72e8998c6ef8dea5"
950931"checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
951932"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
@@ -954,12 +935,11 @@ dependencies = [
954935"checksum redox_syscall 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1"
955936"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
956937"checksum regex 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2069749032ea3ec200ca51e4a31df41759190a88edca0d2d86ee8bedf7073341"
957−"checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e"
958938"checksum regex-syntax 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "747ba3b235651f6e2f67dfa8bcdcd073ddb7c243cb21c442fc12395dfcac212d"
959939"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
960940"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
961941"checksum ryu 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7153dd96dade874ab973e098cb62fcdbb89a03682e46b144fd09550998d4a4a7"
962−"checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
942+"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
963943"checksum same-file 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "10f7794e2fda7f594866840e95f5c5962e886e228e68b6505885811a94dd728c"
964944"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
965945"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
@@ -971,14 +951,13 @@ dependencies = [
971951"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
972952"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
973953"checksum syn 0.15.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b10ee269228fb723234fce98e9aac0eaed2bd5f1ad2f6930e8d5b93f04445a1a"
974−"checksum syntect 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dc8a6f0db88d4afc340522c20d260411e746b2225b257c6b238a75de9d7cec78"
954+"checksum syntect 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50c786fb48ac45b60657eef8af53f75ab96819fd581b6185a94839db19d9e2d7"
975955"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
976956"checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"
977957"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
978958"checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625"
979959"checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6"
980960"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
981−"checksum time 0.1.40 (registry+https://github.com/rust-lang/crates.io-index)" = "d825be0eb33fda1a7e68012d51e9c7f451dc1a69391e7fdc197060bb8c56667b"
982961"checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d"
983962"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
984963"checksum unicode-normalization 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6a0180bc61fc5a987082bfa111f4cc95c4caff7f9799f3e46df09163a937aa25"
Cargo.toml+1−1
@@ -31,7 +31,7 @@ default-features = false
3131features = []
3232
3333[dependencies.syntect]
34−version = "2.1"
34+version = "3.0"
3535default-features = false
3636features = ["parsing", "yaml-load", "dump-load", "dump-create"]
3737
assets/syntaxes.bin

Binary file not shown.

src/assets.rs+41−52
@@ -1,13 +1,16 @@
1−use directories::ProjectDirs;
2−use errors::*;
31use std::borrow::Cow;
42use std::collections::BTreeMap;
53use std::fs::{self, File};
4+use std::io::BufReader;
65use std::path::{Path, PathBuf};
6+
77use syntect::dumps::{dump_to_file, from_binary, from_reader};
88use syntect::highlighting::{Theme, ThemeSet};
9−use syntect::parsing::{SyntaxDefinition, SyntaxSet};
9+use syntect::parsing::{SyntaxReference, SyntaxSet, SyntaxSetBuilder};
10+
11+use directories::ProjectDirs;
1012
13+use errors::*;
1114use inputfile::{InputFile, InputFileReader};
1215
1316lazy_static! {
@@ -27,31 +30,20 @@ impl HighlightingAssets {
2730 Self::from_cache().unwrap_or_else(|_| Self::from_binary())
2831 }
2932
30− fn empty() -> Self {
31− let mut syntax_set = SyntaxSet::new();
32− syntax_set.load_plain_text_syntax();
33−
34− let theme_set = ThemeSet {
35− themes: BTreeMap::new(),
36− };
37− HighlightingAssets {
38− syntax_set,
39− theme_set,
40− }
41− }
42−
4333 pub fn from_files(dir: Option<&Path>, start_empty: bool) -> Result<Self> {
4434 let source_dir = dir.unwrap_or_else(|| PROJECT_DIRS.config_dir());
4535
46− let mut assets = if start_empty {
47− Self::empty()
36+ let mut theme_set = if start_empty {
37+ ThemeSet {
38+ themes: BTreeMap::new(),
39+ }
4840 } else {
49− Self::from_binary_unlinked()
41+ Self::get_integrated_themeset()
5042 };
5143
5244 let theme_dir = source_dir.join("themes");
5345
54− let res = extend_theme_set(&mut assets.theme_set, &theme_dir);
46+ let res = theme_set.add_from_folder(&theme_dir);
5547 if !res.is_ok() {
5648 println!(
5749 "No themes were found in '{}', using the default set",
@@ -59,9 +51,17 @@ impl HighlightingAssets {
5951 );
6052 }
6153
54+ let mut syntax_set_builder = if start_empty {
55+ let mut builder = SyntaxSetBuilder::new();
56+ builder.add_plain_text_syntax();
57+ builder
58+ } else {
59+ Self::get_integrated_syntaxset().into_builder()
60+ };
61+
6262 let syntax_dir = source_dir.join("syntaxes");
6363 if syntax_dir.exists() {
64− assets.syntax_set.load_syntaxes(syntax_dir, true)?;
64+ syntax_set_builder.add_from_folder(syntax_dir, true)?;
6565 } else {
6666 println!(
6767 "No syntaxes were found in '{}', using the default set.",
@@ -69,7 +69,10 @@ impl HighlightingAssets {
6969 );
7070 }
7171
72− Ok(assets)
72+ Ok(HighlightingAssets {
73+ syntax_set: syntax_set_builder.build(),
74+ theme_set,
75+ })
7376 }
7477
7578 fn from_cache() -> Result<Self> {
@@ -80,9 +83,8 @@ impl HighlightingAssets {
8083 syntax_set_path().to_string_lossy()
8184 )
8285 })?;
83− let mut syntax_set: SyntaxSet =
84− from_reader(syntax_set_file).chain_err(|| "Could not parse cached syntax set")?;
85− syntax_set.link_syntaxes();
86+ let syntax_set: SyntaxSet = from_reader(BufReader::new(syntax_set_file))
87+ .chain_err(|| "Could not parse cached syntax set")?;
8688
8789 let theme_set_file = File::open(&theme_set_path).chain_err(|| {
8890 format!(
@@ -90,8 +92,8 @@ impl HighlightingAssets {
9092 theme_set_path.to_string_lossy()
9193 )
9294 })?;
93− let theme_set: ThemeSet =
94− from_reader(theme_set_file).chain_err(|| "Could not parse cached theme set")?;
95+ let theme_set: ThemeSet = from_reader(BufReader::new(theme_set_file))
96+ .chain_err(|| "Could not parse cached theme set")?;
9597
9698 Ok(HighlightingAssets {
9799 syntax_set,
@@ -99,9 +101,17 @@ impl HighlightingAssets {
99101 })
100102 }
101103
102− fn from_binary_unlinked() -> Self {
103− let syntax_set: SyntaxSet = from_binary(include_bytes!("../assets/syntaxes.bin"));
104− let theme_set: ThemeSet = from_binary(include_bytes!("../assets/themes.bin"));
104+ fn get_integrated_syntaxset() -> SyntaxSet {
105+ from_binary(include_bytes!("../assets/syntaxes.bin"))
106+ }
107+
108+ fn get_integrated_themeset() -> ThemeSet {
109+ from_binary(include_bytes!("../assets/themes.bin"))
110+ }
111+
112+ fn from_binary() -> Self {
113+ let syntax_set = Self::get_integrated_syntaxset();
114+ let theme_set = Self::get_integrated_themeset();
105115
106116 HighlightingAssets {
107117 syntax_set,
@@ -109,12 +119,6 @@ impl HighlightingAssets {
109119 }
110120 }
111121
112− fn from_binary() -> Self {
113− let mut assets = Self::from_binary_unlinked();
114− assets.syntax_set.link_syntaxes();
115− assets
116− }
117−
118122 pub fn save(&self, dir: Option<&Path>) -> Result<()> {
119123 let target_dir = dir.unwrap_or_else(|| PROJECT_DIRS.cache_dir());
120124 let _ = fs::create_dir(target_dir);
@@ -168,7 +172,7 @@ impl HighlightingAssets {
168172 language: Option<&str>,
169173 filename: InputFile,
170174 reader: &mut InputFileReader,
171− ) -> &SyntaxDefinition {
175+ ) -> &SyntaxReference {
172176 let syntax = match (language, filename) {
173177 (Some(language), _) => self.syntax_set.find_syntax_by_token(language),
174178 (None, InputFile::Ordinary(filename)) => {
@@ -199,21 +203,6 @@ impl HighlightingAssets {
199203 }
200204}
201205
202−// TODO: this function will soon be part of syntect's `ThemeSet`.
203−fn extend_theme_set<P: AsRef<Path>>(theme_set: &mut ThemeSet, folder: P) -> Result<()> {
204− let paths = ThemeSet::discover_theme_paths(folder)?;
205− for p in &paths {
206− let theme = ThemeSet::get_theme(p)?;
207− let basename = p
208− .file_stem()
209− .and_then(|x| x.to_str())
210− .ok_or("Could not get theme basename")?;
211− theme_set.themes.insert(basename.to_owned(), theme);
212− }
213−
214− Ok(())
215−}
216−
217206fn theme_set_path() -> PathBuf {
218207 PROJECT_DIRS.cache_dir().join("themes.bin")
219208}
src/printer.rs+4−1
@@ -8,6 +8,7 @@ use console::AnsiCodeIterator;
88
99use syntect::easy::HighlightLines;
1010use syntect::highlighting::Theme;
11+use syntect::parsing::SyntaxSet;
1112
1213use content_inspector::ContentType;
1314
@@ -77,6 +78,7 @@ pub struct InteractivePrinter<'a> {
7778 content_type: ContentType,
7879 pub line_changes: Option<LineChanges>,
7980 highlighter: Option<HighlightLines<'a>>,
81+ syntax_set: &'a SyntaxSet,
8082}
8183
8284impl<'a> InteractivePrinter<'a> {
@@ -153,6 +155,7 @@ impl<'a> InteractivePrinter<'a> {
153155 ansi_prefix_sgr: String::new(),
154156 line_changes,
155157 highlighter,
158+ syntax_set: &assets.syntax_set,
156159 }
157160 }
158161
@@ -267,7 +270,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
267270 return Ok(());
268271 }
269272 };
270− highlighter.highlight(line.as_ref())
273+ highlighter.highlight(line.as_ref(), self.syntax_set)
271274 };
272275
273276 if out_of_range {