summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsharkdp <davidpeter@web.de>2018-05-31 15:27:55 +0200
committersharkdp <davidpeter@web.de>2018-05-31 15:27:55 +0200
commite27bdfc7d66f0b9a98ff0dc78113cccb96fefb19 (patch)
tree72b30b03ca628852217d1a24259927846fce144e
parenta7f4f202cb5b6b07cfc890461b4dd22b47f95690 (diff)
Fix clippy warnings
-rw-r--r--Cargo.lock4
-rw-r--r--src/printer.rs4
2 files changed, 5 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock
index cf745ea9..8c593aa8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -50,7 +50,7 @@ dependencies = [
"error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"git2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "syntect 2.0.1",
+ "syntect 2.0.1 (git+https://github.com/trishume/syntect?rev=c025dad49564e96322df4468fd268b65b91b2eae)",
]
[[package]]
@@ -581,6 +581,7 @@ dependencies = [
[[package]]
name = "syntect"
version = "2.0.1"
+source = "git+https://github.com/trishume/syntect?rev=c025dad49564e96322df4468fd268b65b91b2eae#c025dad49564e96322df4468fd268b65b91b2eae"
dependencies = [
"bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -840,6 +841,7 @@ dependencies = [
"checksum stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "15132e0e364248108c5e2c02e3ab539be8d6f5d52a01ca9bbf27ed657316f02b"
"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
"checksum syn 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)" = "61b8f1b737f929c6516ba46a3133fd6d5215ad8a62f66760f851f7048aebedfb"
+"checksum syntect 2.0.1 (git+https://github.com/trishume/syntect?rev=c025dad49564e96322df4468fd268b65b91b2eae)" = "<none>"
"checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"
"checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
"checksum termios 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d9cf598a6d7ce700a4e6a9199da127e6819a61e64b68609683cc9a01b5683a"
diff --git a/src/printer.rs b/src/printer.rs
index c0922163..c2c44c26 100644
--- a/src/printer.rs
+++ b/src/printer.rs
@@ -47,7 +47,7 @@ impl<'a> Printer<'a> {
// The grid border decoration isn't added until after the panel_width calculation, since the
// print_horizontal_line, print_header, and print_footer functions all assume the panel
// width is without the grid border.
- if config.output_components.grid() && decorations.len() > 0 {
+ if config.output_components.grid() && !decorations.is_empty() {
decorations.push(Box::new(GridBorderDecoration::new(&colors)));
}
@@ -159,7 +159,7 @@ impl<'a> Printer<'a> {
for &(style, region) in regions.iter() {
let mut ansi_iterator = AnsiCodeIterator::new(region);
let mut ansi_prefix = "";
- while let Some(chunk) = ansi_iterator.next() {
+ for chunk in ansi_iterator {
match chunk {
// ANSI escape passthrough.
(text, true) => {