From 6bc63a40c57dfefd7caf7e5c5ce41314b72fca96 Mon Sep 17 00:00:00 2001 From: Alexandre Bury Date: Thu, 23 Nov 2017 00:28:10 -0800 Subject: [PATCH] Remove odds dependency Now that `Vec::splice` is stable. Note: this means rustc >= 1.22 is required. --- Cargo.toml | 1 - src/lib.rs | 1 - src/views/text_area.rs | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c96696c..ac2188c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,6 @@ repository = "gyscos/Cursive" log = "0.3" maplit = "1.0.0" num = "0.1" -odds = "0.2" owning_ref = "0.3" toml = "0.4" unicode-segmentation = "1.0" diff --git a/src/lib.rs b/src/lib.rs index df27563..ef30853 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -64,7 +64,6 @@ extern crate maplit; #[macro_use] extern crate log; extern crate num; -extern crate odds; extern crate owning_ref; extern crate toml; extern crate unicode_segmentation; diff --git a/src/views/text_area.rs b/src/views/text_area.rs index 47fd133..1717791 100644 --- a/src/views/text_area.rs +++ b/src/views/text_area.rs @@ -1,7 +1,6 @@ use {Printer, With, XY}; use direction::Direction; use event::{Event, EventResult, Key, MouseButton, MouseEvent}; -use odds::vec::VecExt; use std::cmp::min; use theme::{ColorStyle, Effect}; use unicode_segmentation::UnicodeSegmentation; @@ -360,7 +359,7 @@ impl TextArea { let affected_rows = first_row..last_row; let replacement_rows = new_rows.into_iter().map(|row| row.shifted(first_byte)); - VecExt::splice(&mut self.rows, affected_rows, replacement_rows); + self.rows.splice(affected_rows, replacement_rows); self.fix_ghost_row(); self.scrollbase.set_heights(size.y, self.rows.len()); }