Merge branch 'pr-581'

Conflicts:
	README.md

diff --cc README.md
index 08ad214e6903e84a9c7026c6f01444e5f49024a4,424c89b28b87652d5240fcf75eb6e782b19dc18a..20aaa03c51c10294c582a96acd2a375b37380bf2
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -6,7 -6,7 +6,7 @@@ A collection of lints to catch common m
  [Jump to usage instructions](#usage)
  
  ##Lints
- There are 113 lints included in this crate:
 -There are 110 lints included in this crate:
++There are 114 lints included in this crate:
  
  name                                                                                                           | default | meaning
  ---------------------------------------------------------------------------------------------------------------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

diff --cc src/approx_const.rs
index 98e2fa97eba728d884967d63880ffddd07b288d4,f42c723e27ae4c3130b734fe847042efe1ca63d8..d18785ab81859cdd56f150ecf7afdd1ec099641c
--- 1/src/approx_const.rs
--- 2/src/approx_const.rs
+++ b/src/approx_const.rs
@@@ -2,11 -2,9 +2,9 @@@ use rustc::lint::*
  use rustc_front::hir::*;
  use std::f64::consts as f64;
  use utils::span_lint;
- use syntax::ast::Lit_::*;
- use syntax::ast::Lit;
- use syntax::ast::FloatTy::*;
+ use syntax::ast::{Lit, Lit_, FloatTy};
  
 -/// **What it does:** This lint checks for floating point literals that approximate constants which are defined in [`std::f32::consts`](https://doc.rust-lang.org/stable/std/f32/consts/#constants) or [`std::f64::consts`](https://doc.rust-lang.org/stable/std/f64/consts/#constants), respectively, suggesting to use the predefined constant. This lint is `Warn` by default.
 +/// **What it does:** This lint checks for floating point literals that approximate constants which are defined in [`std::f32::consts`](https://doc.rust-lang.org/stable/std/f32/consts/#constants) or [`std::f64::consts`](https://doc.rust-lang.org/stable/std/f64/consts/#constants), respectively, suggesting to use the predefined constant.
  ///
  /// **Why is this bad?** Usually, the definition in the standard library is more precise than what people come up with. If you find that your definition is actually more precise, please [file a Rust issue](https://github.com/rust-lang/rust/issues).
  ///

diff --cc src/bit_mask.rs
Simple merge

diff --cc src/len_zero.rs
Simple merge

diff --cc src/lib.rs
index 33de4d6fb792b0ebb5a8d5a51beb10e438d987da,4f3de70db4da7a5335139664d53636dd792f80ee..fa98beb8d7460f576678ea3e4c24fe9406e688ff
--- 1/src/lib.rs
--- 2/src/lib.rs
+++ b/src/lib.rs
@@@ -154,9 -152,10 +156,10 @@@ pub fn plugin_registrar(reg: &mut Regis
      reg.register_late_lint_pass(box vec::UselessVec);
      reg.register_late_lint_pass(box drop_ref::DropRefPass);
      reg.register_late_lint_pass(box types::AbsurdUnsignedComparisons);
 -
 +    reg.register_late_lint_pass(box regex::RegexPass);
  
      reg.register_lint_group("clippy_pedantic", vec![
+         enum_glob_use::ENUM_GLOB_USE,
          matches::SINGLE_MATCH_ELSE,
          methods::OPTION_UNWRAP_USED,
          methods::RESULT_UNWRAP_USED,

diff --cc src/minmax.rs
Simple merge

diff --cc src/needless_bool.rs
Simple merge

diff --cc src/types.rs
Simple merge

diff --cc src/unicode.rs
Simple merge

diff --cc src/utils.rs
Simple merge