git.iko.soy/helix
on master help sign in
Update to ropey 1.5
370a16dBlaž Hrastnik
Cargo.lock+4−5
compare with master
unifiedsplit
@@ -457,7 +457,6 @@ dependencies = [
457 "once_cell",
457 "once_cell",
458 "pulldown-cmark",
458 "pulldown-cmark",
459 "retain_mut",
459 "retain_mut",
460− "ropey",
461 "serde",
460 "serde",
462 "serde_json",
461 "serde_json",
463 "signal-hook",
462 "signal-hook",
@@ -835,9 +834,9 @@ checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0"
835
834
836[[package]]
835[[package]]
837name = "ropey"
836name = "ropey"
838−version = "1.4.1"
837+version = "1.5.0"
839source = "registry+https://github.com/rust-lang/crates.io-index"
838source = "registry+https://github.com/rust-lang/crates.io-index"
840−checksum = "fa0dd9b26e2a102b33d400b7b7d196c81a4014eb96eda90b1c5b48d7215d9633"
839+checksum = "bbd22239fafefc42138ca5da064f3c17726a80d2379d817a3521240e78dd0064"
841dependencies = [
840dependencies = [
842 "smallvec",
841 "smallvec",
843 "str_indices",
842 "str_indices",
@@ -1016,9 +1015,9 @@ checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
1016
1015
1017[[package]]
1016[[package]]
1018name = "str_indices"
1017name = "str_indices"
1019−version = "0.3.2"
1018+version = "0.4.0"
1020source = "registry+https://github.com/rust-lang/crates.io-index"
1019source = "registry+https://github.com/rust-lang/crates.io-index"
1021−checksum = "adfad63a1b47951101cd667a85b2959a62910cf03f814fff25df89c460b873f8"
1020+checksum = "9d9199fa80c817e074620be84374a520062ebac833f358d74b37060ce4a0f2c0"
1022
1021
1023[[package]]
1022[[package]]
1024name = "syn"
1023name = "syn"
helix-core/Cargo.toml+1−1
@@ -16,7 +16,7 @@ unicode-lines = ["ropey/unicode_lines"]
16[dependencies]
16[dependencies]
17helix-loader = { version = "0.6", path = "../helix-loader" }
17helix-loader = { version = "0.6", path = "../helix-loader" }
18
18
19−ropey = { version = "1.4", default-features = false }
19+ropey = { version = "1.5", default-features = false, features = ["simd"] }
20smallvec = "1.8"
20smallvec = "1.8"
21smartstring = "1.0.1"
21smartstring = "1.0.1"
22unicode-segmentation = "1.9"
22unicode-segmentation = "1.9"
helix-core/src/lib.rs+1−1
@@ -52,7 +52,7 @@ pub fn find_root(root: Option<&str>, root_markers: &[String]) -> Option<std::pat
52 .cloned()
52 .cloned()
53}
53}
54
54
55−pub use ropey::{Rope, RopeBuilder, RopeSlice};
55+pub use ropey::{str_utils, Rope, RopeBuilder, RopeSlice};
56
56
57// pub use tendril::StrTendril as Tendril;
57// pub use tendril::StrTendril as Tendril;
58pub use smartstring::SmartString;
58pub use smartstring::SmartString;
helix-term/Cargo.toml−1
@@ -33,7 +33,6 @@ anyhow = "1"
33once_cell = "1.12"
33once_cell = "1.12"
34
34
35which = "4.2"
35which = "4.2"
36−ropey = { version = "1.4", default-features = false }
37
36
38tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
37tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
39tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
38tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
helix-term/src/ui/editor.rs+1−1
@@ -467,7 +467,7 @@ impl EditorView {
467 // make sure we display tab as appropriate amount of spaces
467 // make sure we display tab as appropriate amount of spaces
468 let visual_tab_width = tab_width - (visual_x as usize % tab_width);
468 let visual_tab_width = tab_width - (visual_x as usize % tab_width);
469 let grapheme_tab_width =
469 let grapheme_tab_width =
470− ropey::str_utils::char_to_byte_idx(&tab, visual_tab_width);
470+ helix_core::str_utils::char_to_byte_idx(&tab, visual_tab_width);
471
471
472 (&tab[..grapheme_tab_width], visual_tab_width)
472 (&tab[..grapheme_tab_width], visual_tab_width)
473 } else if grapheme == " " {
473 } else if grapheme == " " {