From ddb9a558170ad16f19135b2f6a5a7a7e8ac61c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Wed, 25 Jul 2018 21:46:45 +0200
Subject: [PATCH] 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).
---
 .travis.yml            | 1 +
 font/src/darwin/mod.rs | 2 +-
 font/src/ft/fc/mod.rs  | 6 +++---
 src/main.rs            | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d346c9f..eebed8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,3 +31,4 @@ matrix:
 script:
   - if [ -n "$CLIPPY" ]; then cargo clippy --all-features --all-targets; fi
   - if [ -z "$CLIPPY" ]; then cargo test; fi
+  - if [ -z "$CLIPPY" ]; then cargo test -p font; fi
diff --git a/font/src/darwin/mod.rs b/font/src/darwin/mod.rs
index 4351af6..2f9d5fe 100644
--- a/font/src/darwin/mod.rs
+++ b/font/src/darwin/mod.rs
@@ -631,7 +631,7 @@ mod tests {
                         };
                         print!("{}", c);
                     }
-                    print!("\n");
+                    println!();
                 }
             }
         }
diff --git a/font/src/ft/fc/mod.rs b/font/src/ft/fc/mod.rs
index 865f63c..a999a40 100644
--- a/font/src/ft/fc/mod.rs
+++ b/font/src/ft/fc/mod.rs
@@ -326,7 +326,7 @@ mod tests {
         print!("embeddedbitmap={:?}; ", font.embeddedbitmap());
         print!("lcdfilter={:?}; ", font.lcdfilter());
         print!("hintstyle={:?}", font.hintstyle());
-        println!("");
+        println!();
     }
 
     #[test]
@@ -346,7 +346,7 @@ mod tests {
             print!("style={:?}; ", font.style());
             print!("rgba={:?}", font.rgba());
             print!("rgba={:?}", font.rgba());
-            println!("");
+            println!();
         }
     }
 
@@ -367,7 +367,7 @@ mod tests {
             print!("family={:?}; ", font.family());
             print!("style={:?}; ", font.style());
             print!("rgba={:?}", font.rgba());
-            println!("");
+            println!();
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
index f7a1fa1..fc6b082 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -180,7 +180,7 @@ fn run(mut config: Config, options: &cli::Options) -> Result<(), Box<Error>> {
             .as_ref()
             .and_then(|monitor| monitor.pending_config())
         {
-            config = new_config.update_dynamic_title(&options);
+            config = new_config.update_dynamic_title(options);
             display.update_config(&config);
             processor.update_config(&config);
             terminal.update_config(&config);