---

yaml
---
r: 62908
b: refs/heads/snap-stage3
c: 11f31b9
h: refs/heads/master
v: v3

Author: emberian

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 5311d590230428aa5f2473d9dc6355ed943f731d
+refs/heads/snap-stage3: 11f31b96848c7d04f79e6aaa2c789857bb224526
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/term.rs

@@ -75,7 +75,8 @@ pub impl Terminal {
         }
 
         let mut inf = ti.get();
-        let cs = *inf.numbers.find_or_insert(~"colors", 0) >= 16 && inf.strings.find(&~"setaf").is_some()
+        let cs = *inf.numbers.find_or_insert(~"colors", 0) >= 16
+            && inf.strings.find(&~"setaf").is_some()
             && inf.strings.find_equiv(&("setab")).is_some();
 
         return Ok(Terminal {out: out, ti: inf, color_supported: cs});

branches/snap-stage3/src/libextra/terminfo/parm.rs

@@ -46,7 +46,7 @@ pub enum Param {
   To be compatible with ncurses, `sta` and `dyn` should be the same between calls to `expand` for
   multiple capabilities for the same terminal.
   */
-pub fn expand(cap: &[u8], params: &mut [Param], sta: &mut [Param], dyn: &mut [Param]) 
+pub fn expand(cap: &[u8], params: &mut [Param], sta: &mut [Param], dyn: &mut [Param])
     -> Result<~[u8], ~str> {
     assert!(cap.len() != 0, "expanding an empty capability makes no sense");
     assert!(params.len() <= 9, "only 9 parameters are supported by capability strings");

branches/snap-stage3/src/libextra/terminfo/parser/compiled.rs

@@ -1,3 +1,13 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
 /// ncurses-compatible compiled terminfo format parsing (term(5))
 
 use core::prelude::*;
@@ -283,11 +293,12 @@ pub fn parse(file: @Reader, longnames: bool) -> Result<~TermInfo, ~str> {
 
 
             // Find the offset of the NUL we want to go to
-            let nulpos = vec::position_between(string_table, offset as uint, string_table_bytes as uint,
-                                               |&b| b == 0);
+            let nulpos = vec::position_between(string_table, offset as uint,
+                                               string_table_bytes as uint, |&b| b == 0);
             match nulpos {
                 Some(x) => {
-                    string_map.insert(name.to_owned(), string_table.slice(offset as uint, x).to_owned())
+                    string_map.insert(name.to_owned(),
+                                      string_table.slice(offset as uint, x).to_owned())
                 },
                 None => {
                     return Err(~"invalid file: missing NUL in string_table");
@@ -303,7 +314,7 @@ pub fn parse(file: @Reader, longnames: bool) -> Result<~TermInfo, ~str> {
 #[cfg(test)]
 mod test {
     use super::*;
-    use p = std::path::PosixPath;
+    use p = std::path::Path;
 
     #[test]
     fn test_veclens() {
@@ -314,6 +325,7 @@ mod test {
 
     #[test]
     fn test_parse() {
-        parse(io::file_reader(&p("/usr/share/terminfo/r/rxvt-256color")).unwrap(), false);
+        // FIXME #6870: Distribute a compiled file in src/tests and test there
+        // parse(io::file_reader(&p("/usr/share/terminfo/r/rxvt-256color")).unwrap(), false);
     }
 }