mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix formatting for tidy

Browse Source
This commit is contained in:
Corey Richardson 2013-05-31 13:37:58 -04:00
parent 5311d59023
commit 11f31b9684
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libextra/term.rs
View File

@ -75,7 +75,8 @@ pub fn new(out: @io::Writer) -> Result<Terminal, ~str> {
}
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});

2
src/libextra/terminfo/parm.rs
View File

@ -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");

22
src/libextra/terminfo/parser/compiled.rs
View File

@ -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 @@ fn test_veclens() {
#[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);
}
}