Fix clippy lints and run font tests on travis

This fixes some existing clippy issues and runs the `font` tests through travis.

Testing of copypasta crate was omitted due to problens when running on headless travis-ci environment (x11 clipboard would fail).
This commit is contained in:
Matthias Krüger 2018-07-25 21:46:45 +02:00 committed by Christian Duerr
parent d25134bc6b
commit ddb9a55817
4 changed files with 6 additions and 5 deletions

View File

@ -31,3 +31,4 @@ matrix:
script: script:
- if [ -n "$CLIPPY" ]; then cargo clippy --all-features --all-targets; fi - if [ -n "$CLIPPY" ]; then cargo clippy --all-features --all-targets; fi
- if [ -z "$CLIPPY" ]; then cargo test; fi - if [ -z "$CLIPPY" ]; then cargo test; fi
- if [ -z "$CLIPPY" ]; then cargo test -p font; fi

View File

@ -631,7 +631,7 @@ mod tests {
}; };
print!("{}", c); print!("{}", c);
} }
print!("\n"); println!();
} }
} }
} }

View File

@ -326,7 +326,7 @@ mod tests {
print!("embeddedbitmap={:?}; ", font.embeddedbitmap()); print!("embeddedbitmap={:?}; ", font.embeddedbitmap());
print!("lcdfilter={:?}; ", font.lcdfilter()); print!("lcdfilter={:?}; ", font.lcdfilter());
print!("hintstyle={:?}", font.hintstyle()); print!("hintstyle={:?}", font.hintstyle());
println!(""); println!();
} }
#[test] #[test]
@ -346,7 +346,7 @@ mod tests {
print!("style={:?}; ", font.style()); print!("style={:?}; ", font.style());
print!("rgba={:?}", font.rgba()); print!("rgba={:?}", font.rgba());
print!("rgba={:?}", font.rgba()); print!("rgba={:?}", font.rgba());
println!(""); println!();
} }
} }
@ -367,7 +367,7 @@ mod tests {
print!("family={:?}; ", font.family()); print!("family={:?}; ", font.family());
print!("style={:?}; ", font.style()); print!("style={:?}; ", font.style());
print!("rgba={:?}", font.rgba()); print!("rgba={:?}", font.rgba());
println!(""); println!();
} }
} }
} }

View File

@ -180,7 +180,7 @@ fn run(mut config: Config, options: &cli::Options) -> Result<(), Box<Error>> {
.as_ref() .as_ref()
.and_then(|monitor| monitor.pending_config()) .and_then(|monitor| monitor.pending_config())
{ {
config = new_config.update_dynamic_title(&options); config = new_config.update_dynamic_title(options);
display.update_config(&config); display.update_config(&config);
processor.update_config(&config); processor.update_config(&config);
terminal.update_config(&config); terminal.update_config(&config);