Auto merge of #328 - kbknapp:lints-update, r=kbknapp

Lints update
clap-rs · Oct 29, 2015 · 8a59c3f · 8a59c3f
2 parents 3fcdc6f + e639ada
commit 8a59c3f
Show file tree

Hide file tree

Showing 23 changed files with 1,449 additions and 1,291 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@ Cargo.lock
 # Backup files
 *.bak
 *.bk
+*.orig
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,21 +16,20 @@ bitflags = "0.3.2"
 ansi_term = { version = "~0.6.3", optional = true }
 strsim    = { version = "~0.4.0", optional = true }
 yaml-rust = { version = "~0.2.2", optional = true }
-#clippy   = { version = "~0.0.12", optional = true }
+clippy    = { version = "~0.0.22", optional = true }
 
 [features]
 default = ["suggestions", "color"]
 suggestions = ["strsim"]
 color = ["ansi_term"]
 yaml = ["yaml-rust"]
-#lints = ["clippy", "nightly"]
+lints = ["clippy", "nightly"]
 
 # for building with nightly and unstable features
 nightly = []
 
 # for building with travis-cargo
-#unstable = ["lints", "nightly"]
-unstable = ["nightly"]
+unstable = ["lints", "nightly"]
 
 # for building with debug messages
 debug = []

diff --git a/rustfmt.toml b/rustfmt.toml
@@ -0,0 +1,2 @@
+format_strings = false
+reorder_imports = true
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,3 +19,4 @@ Cargo.lock @@
     # Backup files
     *.bak
     *.bk
+    *.orig