about summary refs log tree commit diff
path: root/src/libterm
diff options
context:
space:
mode:
authorJorge Aparicio <japaricious@gmail.com>2015-01-07 11:58:31 -0500
committerJorge Aparicio <japaricious@gmail.com>2015-01-07 17:35:56 -0500
commit517f1cc63c1a5df148fdeef56791f66771d3d8e8 (patch)
tree0d321b5be3d9610f460561e8dc446a2132bb5422 /src/libterm
parent6e2bfe4ae8277f0cfe76831b446d50820b4527f5 (diff)
use slicing sugar
Diffstat (limited to 'src/libterm')
-rw-r--r--src/libterm/terminfo/mod.rs2
-rw-r--r--src/libterm/terminfo/parser/compiled.rs6
-rw-r--r--src/libterm/terminfo/searcher.rs4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/libterm/terminfo/mod.rs b/src/libterm/terminfo/mod.rs
index f2dcdc6160a..4933938f338 100644
--- a/src/libterm/terminfo/mod.rs
+++ b/src/libterm/terminfo/mod.rs
@@ -180,7 +180,7 @@ impl<T: Writer+Send> TerminfoTerminal<T> {
             }
         };
 
-        let entry = open(term.index(&FullRange));
+        let entry = open(&term[]);
         if entry.is_err() {
             if os::getenv("MSYSCON").map_or(false, |s| {
                     "mintty.exe" == s
diff --git a/src/libterm/terminfo/parser/compiled.rs b/src/libterm/terminfo/parser/compiled.rs
index 7a06849abd1..4735b6e8f2a 100644
--- a/src/libterm/terminfo/parser/compiled.rs
+++ b/src/libterm/terminfo/parser/compiled.rs
@@ -284,13 +284,13 @@ pub fn parse(file: &mut io::Reader, longnames: bool)
 
 
             // Find the offset of the NUL we want to go to
-            let nulpos = string_table.index(&((offset as uint) .. (string_table_bytes as uint)))
+            let nulpos = string_table[(offset as uint) .. (string_table_bytes as uint)]
                 .iter().position(|&b| b == 0);
             match nulpos {
                 Some(len) => {
                     string_map.insert(name.to_string(),
-                                      string_table.index(&((offset as uint) ..
-                                          (offset as uint + len))).to_vec())
+                                      string_table[(offset as uint) ..
+                                                   (offset as uint + len)].to_vec())
                 },
                 None => {
                     return Err("invalid file: missing NUL in \
diff --git a/src/libterm/terminfo/searcher.rs b/src/libterm/terminfo/searcher.rs
index 2651be1ebb8..1fca3c62f78 100644
--- a/src/libterm/terminfo/searcher.rs
+++ b/src/libterm/terminfo/searcher.rs
@@ -61,13 +61,13 @@ pub fn get_dbpath_for_term(term: &str) -> Option<Box<Path>> {
     for p in dirs_to_search.iter() {
         if p.exists() {
             let f = first_char.to_string();
-            let newp = p.join_many(&[f.index(&FullRange), term]);
+            let newp = p.join_many(&[&f[], term]);
             if newp.exists() {
                 return Some(box newp);
             }
             // on some installations the dir is named after the hex of the char (e.g. OS X)
             let f = format!("{:x}", first_char as uint);
-            let newp = p.join_many(&[f.index(&FullRange), term]);
+            let newp = p.join_many(&[&f[], term]);
             if newp.exists() {
                 return Some(box newp);
             }