Merge branch 'pr-593'

Conflicts:
	README.md
	src/lib.rs

diff --cc README.md
index d7086a6dac83a701bdd773b76a7e0bd03091aff7,0c94fb3383e1915234ec8998fb2394829c0666c6..006ddcd7a7ff78e5b1c5fd2da7e793989ff229ef
--- 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 108 lints included in this crate:
 -There are 105 lints included in this crate:
++There are 109 lints included in this crate:
  
  name                                                                                                           | default | meaning
  ---------------------------------------------------------------------------------------------------------------|---------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

diff --cc src/escape.rs
Simple merge

diff --cc src/lib.rs
index 369542841846f6a8b91bab947119de2d4f46b209,3519fb9ee88e51fbe09fc2067671c32d4c1ad562..44dd9fa8c863a2c3db611c8d1becc1fbd971243a
--- 1/src/lib.rs
--- 2/src/lib.rs
+++ b/src/lib.rs
@@@ -148,7 -146,7 +148,8 @@@ pub fn plugin_registrar(reg: &mut Regis
      reg.register_late_lint_pass(box types::CharLitAsU8);
      reg.register_late_lint_pass(box print::PrintLint);
      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_lint_group("clippy_pedantic", vec![