From b713b72e72015f699f76d817b1307bedfedfb7d3 Mon Sep 17 00:00:00 2001 From: Nathan Vegdahl Date: Fri, 10 Aug 2018 16:08:11 -0700 Subject: [PATCH] Updating for latest Ropey master. --- Cargo.lock | 6 +++--- Cargo.toml | 4 ++-- src/utils.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8d861bb..7742c74 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3,7 +3,7 @@ name = "Led" version = "0.0.2" dependencies = [ "docopt 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", - "ropey 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)", + "ropey 0.8.4 (git+https://github.com/cessen/ropey)", "serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -102,7 +102,7 @@ dependencies = [ [[package]] name = "ropey" version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/cessen/ropey#7c8f6b4d59baa5936386c7a4a9371b8d6274de27" dependencies = [ "smallvec 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -214,7 +214,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" "checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384" "checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7" -"checksum ropey 0.8.4 (registry+https://github.com/rust-lang/crates.io-index)" = "22ea9149b774f376dc3b7c15e884380a4400cd24476f7d020b6ee6f25dec24dd" +"checksum ropey 0.8.4 (git+https://github.com/cessen/ropey)" = "" "checksum serde 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "0c3adf19c07af6d186d91dae8927b83b0553d07ca56cbf7f2f32560455c91920" "checksum serde_derive 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "3525a779832b08693031b8ecfb0de81cd71cfd3812088fafe9a7496789572124" "checksum smallvec 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "26df3bb03ca5eac2e64192b723d51f56c1b1e0860e7c766281f4598f181acdc8" diff --git a/Cargo.toml b/Cargo.toml index 7624a73..b2d8e55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,8 +9,8 @@ name = "led" path = "src/main.rs" [dependencies] -ropey = "0.8" -# ropey = { git = "https://github.com/cessen/ropey", branch = "master" } +# ropey = "0.8" +ropey = { git = "https://github.com/cessen/ropey", branch = "master" } unicode-segmentation = "1.2.1" unicode-width = "0.1" serde = "1.*" diff --git a/src/utils.rs b/src/utils.rs index 24a4634..040ca6c 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -182,7 +182,7 @@ impl<'a> Iterator for RopeGraphemes<'a> { } else { let a2 = a - self.cur_chunk_start; let b2 = b - self.cur_chunk_start; - Some(RopeSlice::from_str(&self.cur_chunk[a2..b2])) + Some((&self.cur_chunk[a2..b2]).into()) } } }