diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-27 12:19:19 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-27 12:19:19 +0000 |
commit | e422c2e2f4117cf977d28a40a9c8e4dc4cfee811 (patch) | |
tree | 9ea1dc365e420c286834b40923deb95a0ca291b9 /Cargo.lock | |
parent | 55ab0c602e391537f5e1a84a617fdd817e6a4200 (diff) | |
parent | 1cda43aafd623b400f5916b1d3727b56c136081b (diff) |
Merge #325
325: implement translate_offset_with_edit r=matklad a=vemoo
- Implement `translate_offset_with_edit` to resolve #105
- Add proptest impls for text, offsets and edits and use them in tests for `translate_offset_with_edit` and `LineIndex`
- Added benchmark for `translate_offset_with_edit`
Co-authored-by: Bernardo <[email protected]>
Diffstat (limited to 'Cargo.lock')
-rw-r--r-- | Cargo.lock | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/Cargo.lock b/Cargo.lock index 69134b434..0d417c024 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -74,6 +74,19 @@ dependencies = [ | |||
74 | ] | 74 | ] |
75 | 75 | ||
76 | [[package]] | 76 | [[package]] |
77 | name = "bit-set" | ||
78 | version = "0.5.0" | ||
79 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
80 | dependencies = [ | ||
81 | "bit-vec 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", | ||
82 | ] | ||
83 | |||
84 | [[package]] | ||
85 | name = "bit-vec" | ||
86 | version = "0.5.0" | ||
87 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
88 | |||
89 | [[package]] | ||
77 | name = "bitflags" | 90 | name = "bitflags" |
78 | version = "1.0.4" | 91 | version = "1.0.4" |
79 | source = "registry+https://github.com/rust-lang/crates.io-index" | 92 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -303,6 +316,11 @@ dependencies = [ | |||
303 | ] | 316 | ] |
304 | 317 | ||
305 | [[package]] | 318 | [[package]] |
319 | name = "fnv" | ||
320 | version = "1.0.6" | ||
321 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
322 | |||
323 | [[package]] | ||
306 | name = "fst" | 324 | name = "fst" |
307 | version = "0.3.3" | 325 | version = "0.3.3" |
308 | source = "registry+https://github.com/rust-lang/crates.io-index" | 326 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -626,6 +644,28 @@ dependencies = [ | |||
626 | ] | 644 | ] |
627 | 645 | ||
628 | [[package]] | 646 | [[package]] |
647 | name = "proptest" | ||
648 | version = "0.8.7" | ||
649 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
650 | dependencies = [ | ||
651 | "bit-set 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", | ||
652 | "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", | ||
653 | "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)", | ||
654 | "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", | ||
655 | "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", | ||
656 | "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", | ||
657 | "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", | ||
658 | "regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", | ||
659 | "rusty-fork 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", | ||
660 | "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)", | ||
661 | ] | ||
662 | |||
663 | [[package]] | ||
664 | name = "quick-error" | ||
665 | version = "1.2.2" | ||
666 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
667 | |||
668 | [[package]] | ||
629 | name = "quote" | 669 | name = "quote" |
630 | version = "0.6.10" | 670 | version = "0.6.10" |
631 | source = "registry+https://github.com/rust-lang/crates.io-index" | 671 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -684,6 +724,7 @@ version = "0.1.0" | |||
684 | dependencies = [ | 724 | dependencies = [ |
685 | "itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", | 725 | "itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)", |
686 | "join_to_string 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", | 726 | "join_to_string 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", |
727 | "proptest 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)", | ||
687 | "ra_syntax 0.1.0", | 728 | "ra_syntax 0.1.0", |
688 | "ra_text_edit 0.1.0", | 729 | "ra_text_edit 0.1.0", |
689 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 730 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -764,6 +805,7 @@ dependencies = [ | |||
764 | name = "ra_text_edit" | 805 | name = "ra_text_edit" |
765 | version = "0.1.0" | 806 | version = "0.1.0" |
766 | dependencies = [ | 807 | dependencies = [ |
808 | "proptest 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)", | ||
767 | "test_utils 0.1.0", | 809 | "test_utils 0.1.0", |
768 | "text_unit 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", | 810 | "text_unit 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", |
769 | ] | 811 | ] |
@@ -985,6 +1027,17 @@ dependencies = [ | |||
985 | ] | 1027 | ] |
986 | 1028 | ||
987 | [[package]] | 1029 | [[package]] |
1030 | name = "rusty-fork" | ||
1031 | version = "0.2.1" | ||
1032 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1033 | dependencies = [ | ||
1034 | "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", | ||
1035 | "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", | ||
1036 | "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)", | ||
1037 | "wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", | ||
1038 | ] | ||
1039 | |||
1040 | [[package]] | ||
988 | name = "ryu" | 1041 | name = "ryu" |
989 | version = "0.2.7" | 1042 | version = "0.2.7" |
990 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1043 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -1414,6 +1467,14 @@ version = "1.0.2" | |||
1414 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1467 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1415 | 1468 | ||
1416 | [[package]] | 1469 | [[package]] |
1470 | name = "wait-timeout" | ||
1471 | version = "0.1.5" | ||
1472 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
1473 | dependencies = [ | ||
1474 | "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)", | ||
1475 | ] | ||
1476 | |||
1477 | [[package]] | ||
1417 | name = "walkdir" | 1478 | name = "walkdir" |
1418 | version = "2.2.7" | 1479 | version = "2.2.7" |
1419 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1480 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -1460,6 +1521,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1460 | "checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5" | 1521 | "checksum backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "b5b493b66e03090ebc4343eb02f94ff944e0cbc9ac6571491d170ba026741eb5" |
1461 | "checksum backtrace-sys 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3fcce89e5ad5c8949caa9434501f7b55415b3e7ad5270cb88c75a8d35e8f1279" | 1522 | "checksum backtrace-sys 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3fcce89e5ad5c8949caa9434501f7b55415b3e7ad5270cb88c75a8d35e8f1279" |
1462 | "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" | 1523 | "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" |
1524 | "checksum bit-set 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f1efcc46c18245a69c38fcc5cc650f16d3a59d034f3106e9ed63748f695730a" | ||
1525 | "checksum bit-vec 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4440d5cb623bb7390ae27fec0bb6c61111969860f8e3ae198bfa0663645e67cf" | ||
1463 | "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" | 1526 | "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" |
1464 | "checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab" | 1527 | "checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab" |
1465 | "checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40" | 1528 | "checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40" |
@@ -1488,6 +1551,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1488 | "checksum failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "64c2d913fe8ed3b6c6518eedf4538255b989945c14c2a7d5cbff62a5e2120596" | 1551 | "checksum failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "64c2d913fe8ed3b6c6518eedf4538255b989945c14c2a7d5cbff62a5e2120596" |
1489 | "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" | 1552 | "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" |
1490 | "checksum flexi_logger 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4dda06444ccc8b0a6da19d939989b4a4e83f328710ada449eedaed48c8b903cd" | 1553 | "checksum flexi_logger 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4dda06444ccc8b0a6da19d939989b4a4e83f328710ada449eedaed48c8b903cd" |
1554 | "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" | ||
1491 | "checksum fst 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "db72126ca7dff566cdbbdd54af44668c544897d9d3862b198141f176f1238bdf" | 1555 | "checksum fst 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "db72126ca7dff566cdbbdd54af44668c544897d9d3862b198141f176f1238bdf" |
1492 | "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" | 1556 | "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" |
1493 | "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" | 1557 | "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" |
@@ -1528,6 +1592,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1528 | "checksum pest_generator 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ebee4e9680be4fd162e6f3394ae4192a6b60b1e4d17d845e631f0c68d1a3386" | 1592 | "checksum pest_generator 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ebee4e9680be4fd162e6f3394ae4192a6b60b1e4d17d845e631f0c68d1a3386" |
1529 | "checksum pest_meta 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1f6d5f6f0e6082578c86af197d780dc38328e3f768cec06aac9bc46d714e8221" | 1593 | "checksum pest_meta 2.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1f6d5f6f0e6082578c86af197d780dc38328e3f768cec06aac9bc46d714e8221" |
1530 | "checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09" | 1594 | "checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09" |
1595 | "checksum proptest 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "926d0604475349f463fe44130aae73f2294b5309ab2ca0310b998bd334ef191f" | ||
1596 | "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" | ||
1531 | "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c" | 1597 | "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c" |
1532 | "checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd" | 1598 | "checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd" |
1533 | "checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c" | 1599 | "checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c" |
@@ -1552,6 +1618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1552 | "checksum rustc-demangle 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "01b90379b8664dd83460d59bdc5dd1fd3172b8913788db483ed1325171eab2f7" | 1618 | "checksum rustc-demangle 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "01b90379b8664dd83460d59bdc5dd1fd3172b8913788db483ed1325171eab2f7" |
1553 | "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" | 1619 | "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" |
1554 | "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" | 1620 | "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" |
1621 | "checksum rusty-fork 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9591f190d2852720b679c21f66ad929f9f1d7bb09d1193c26167586029d8489c" | ||
1555 | "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" | 1622 | "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" |
1556 | "checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" | 1623 | "checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" |
1557 | "checksum salsa 0.8.0 (git+https://github.com/matklad/salsa?branch=no-upgrade)" = "<none>" | 1624 | "checksum salsa 0.8.0 (git+https://github.com/matklad/salsa?branch=no-upgrade)" = "<none>" |
@@ -1603,6 +1670,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1603 | "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" | 1670 | "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" |
1604 | "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" | 1671 | "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" |
1605 | "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" | 1672 | "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" |
1673 | "checksum wait-timeout 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b9f3bf741a801531993db6478b95682117471f76916f5e690dd8d45395b09349" | ||
1606 | "checksum walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d9d7ed3431229a144296213105a390676cc49c9b6a72bd19f3176c98e129fa1" | 1674 | "checksum walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d9d7ed3431229a144296213105a390676cc49c9b6a72bd19f3176c98e129fa1" |
1607 | "checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" | 1675 | "checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" |
1608 | "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" | 1676 | "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" |