about summary refs log tree commit diff
path: root/src/libterm/terminfo/parser
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-09-17 12:56:31 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-09-21 22:15:51 -0700
commit0169218047dc989acf9ea25e3122b9c659acb6b3 (patch)
tree8b1cd720a9e38c745359581e74d216a04e39e5ef /src/libterm/terminfo/parser
parent087b9283a0ed8df68f47ab07a25e60bc6a3ca050 (diff)
Fix fallout from Vec stabilization
Diffstat (limited to 'src/libterm/terminfo/parser')
-rw-r--r--src/libterm/terminfo/parser/compiled.rs13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/libterm/terminfo/parser/compiled.rs b/src/libterm/terminfo/parser/compiled.rs
index 2826ecc1a12..f59a4465e1d 100644
--- a/src/libterm/terminfo/parser/compiled.rs
+++ b/src/libterm/terminfo/parser/compiled.rs
@@ -290,9 +290,8 @@ pub fn parse(file: &mut io::Reader, longnames: bool)
             match nulpos {
                 Some(len) => {
                     string_map.insert(name.to_string(),
-                                      Vec::from_slice(
-                                          string_table.slice(offset as uint,
-                                          offset as uint + len)))
+                                      string_table.slice(offset as uint,
+                                          offset as uint + len).to_vec())
                 },
                 None => {
                     return Err("invalid file: missing NUL in \
@@ -314,10 +313,10 @@ pub fn parse(file: &mut io::Reader, longnames: bool)
 /// Create a dummy TermInfo struct for msys terminals
 pub fn msys_terminfo() -> Box<TermInfo> {
     let mut strings = HashMap::new();
-    strings.insert("sgr0".to_string(), Vec::from_slice(b"\x1B[0m"));
-    strings.insert("bold".to_string(), Vec::from_slice(b"\x1B[1m"));
-    strings.insert("setaf".to_string(), Vec::from_slice(b"\x1B[3%p1%dm"));
-    strings.insert("setab".to_string(), Vec::from_slice(b"\x1B[4%p1%dm"));
+    strings.insert("sgr0".to_string(), b"\x1B[0m".to_vec());
+    strings.insert("bold".to_string(), b"\x1B[1m".to_vec());
+    strings.insert("setaf".to_string(), b"\x1B[3%p1%dm".to_vec());
+    strings.insert("setab".to_string(), b"\x1B[4%p1%dm".to_vec());
     box TermInfo {
         names: vec!("cygwin".to_string()), // msys is a fork of an older cygwin version
         bools: HashMap::new(),