From 1f0d33259b0b89b0b29d3bb0e0ed3bbb442fb67b Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 15 Sep 2018 10:03:55 -0700
Subject: [PATCH] Address redundant_field_names lint

---
 saphyr/.travis.yml    |  2 +-
 saphyr/src/emitter.rs |  3 +--
 saphyr/src/scanner.rs | 10 +++-------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/saphyr/.travis.yml b/saphyr/.travis.yml
index e2333c1..513b2ef 100644
--- a/saphyr/.travis.yml
+++ b/saphyr/.travis.yml
@@ -5,7 +5,7 @@ matrix:
     - rust: stable
     - rust: beta
     - rust: nightly
-    - rust: 1.13.0
+    - rust: 1.17.0
       script: cargo build
     - rust: 1.22.1
     - rust: nightly
diff --git a/saphyr/src/emitter.rs b/saphyr/src/emitter.rs
index cb238be..ad7882f 100644
--- a/saphyr/src/emitter.rs
+++ b/saphyr/src/emitter.rs
@@ -113,10 +113,9 @@ fn escape_str(wr: &mut fmt::Write, v: &str) -> Result<(), fmt::Error> {
 impl<'a> YamlEmitter<'a> {
     pub fn new(writer: &'a mut fmt::Write) -> YamlEmitter {
         YamlEmitter {
-            writer: writer,
+            writer,
             best_indent: 2,
             compact: true,
-
             level: -1,
         }
     }
diff --git a/saphyr/src/scanner.rs b/saphyr/src/scanner.rs
index 366eee5..da7e4ef 100644
--- a/saphyr/src/scanner.rs
+++ b/saphyr/src/scanner.rs
@@ -27,11 +27,7 @@ pub struct Marker {
 
 impl Marker {
     fn new(index: usize, line: usize, col: usize) -> Marker {
-        Marker {
-            index: index,
-            line: line,
-            col: col,
-        }
+        Marker { index, line, col }
     }
 
     pub fn index(&self) -> usize {
@@ -135,7 +131,7 @@ impl SimpleKey {
             possible: false,
             required: false,
             token_number: 0,
-            mark: mark,
+            mark,
         }
     }
 }
@@ -227,7 +223,7 @@ impl<T: Iterator<Item = char>> Scanner<T> {
     /// Creates the YAML tokenizer.
     pub fn new(rdr: T) -> Scanner<T> {
         Scanner {
-            rdr: rdr,
+            rdr,
             buffer: VecDeque::new(),
             mark: Marker::new(0, 1, 0),
             tokens: VecDeque::new(),